Merge branch 'master' of github.com:Softcatala/git-po
* 'master' of github.com:Softcatala/git-po:
l10n: Update Catalan translation
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..802a4bf
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,272 @@
+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:
+ - name: try to clone ci-config branch
+ continue-on-error: true
+ 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
+ - 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"
+
+ 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: a=git-sdk-64-minimal && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf -
+ - 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
+ windows-test:
+ runs-on: windows-latest
+ needs: [windows-build]
+ strategy:
+ matrix:
+ nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ steps:
+ - uses: actions/checkout@v1
+ - name: download git-sdk-64-minimal
+ shell: bash
+ run: a=git-sdk-64-minimal && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf -
+ - 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: 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: a=git-sdk-64-minimal && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf -
+ - name: generate Visual Studio solution
+ shell: powershell
+ run: |
+ & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+ make NDEBUG=1 DEVELOPER=1 vcxproj
+ "@
+ if (!$?) { exit(1) }
+ - 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.0.0
+ - 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: |
+ & 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 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]
+ strategy:
+ matrix:
+ nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ steps:
+ - uses: actions/checkout@v1
+ - name: download git-64-portable
+ shell: bash
+ run: a=git-64-portable && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf -
+ - 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 (parallel)
+ shell: powershell
+ env:
+ MSYSTEM: MINGW64
+ NO_SVN_TESTS: 1
+ GIT_TEST_SKIP_REBASE_P: 1
+ run: |
+ & git-64-portable\git-cmd.exe --command=usr\bin\bash.exe -lc @"
+ # Let Git ignore the SDK and the test-cache
+ printf '%s\n' /git-64-portable/ /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 \
+ ${{matrix.nr}} 10 t[0-9]*.sh)
+ "@
+ regular:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
+ strategy:
+ matrix:
+ vector:
+ - jobname: linux-clang
+ cc: clang
+ pool: ubuntu-latest
+ - jobname: linux-gcc
+ cc: gcc
+ pool: ubuntu-latest
+ - jobname: osx-clang
+ cc: clang
+ pool: macos-latest
+ - jobname: osx-gcc
+ cc: gcc
+ pool: macos-latest
+ - jobname: GETTEXT_POISON
+ cc: gcc
+ pool: ubuntu-latest
+ env:
+ CC: ${{matrix.vector.cc}}
+ jobname: ${{matrix.vector.jobname}}
+ runs-on: ${{matrix.vector.pool}}
+ steps:
+ - uses: actions/checkout@v1
+ - run: ci/install-dependencies.sh
+ - run: ci/run-build-and-tests.sh
+ - run: ci/print-test-failures.sh
+ if: failure()
+ - name: Upload failed tests' directories
+ if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+ uses: actions/upload-artifact@v1
+ with:
+ name: failed-tests-${{matrix.vector.jobname}}
+ path: ${{env.FAILED_TEST_ARTIFACTS}}
+ dockerized:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
+ strategy:
+ matrix:
+ vector:
+ - jobname: linux-musl
+ image: alpine
+ - jobname: Linux32
+ image: daald/ubuntu32:xenial
+ env:
+ jobname: ${{matrix.vector.jobname}}
+ runs-on: ubuntu-latest
+ container: ${{matrix.vector.image}}
+ steps:
+ - uses: actions/checkout@v1
+ - run: ci/install-docker-dependencies.sh
+ - run: ci/run-build-and-tests.sh
+ - run: ci/print-test-failures.sh
+ if: failure()
+ - name: Upload failed tests' directories
+ if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+ uses: actions/upload-artifact@v1
+ with:
+ name: failed-tests-${{matrix.vector.jobname}}
+ path: ${{env.FAILED_TEST_ARTIFACTS}}
+ static-analysis:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
+ env:
+ jobname: StaticAnalysis
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v1
+ - run: ci/install-dependencies.sh
+ - run: ci/run-static-analysis.sh
+ documentation:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
+ env:
+ jobname: Documentation
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v1
+ - run: ci/install-dependencies.sh
+ - run: ci/test-documentation.sh
diff --git a/.gitignore b/.gitignore
index aebe7c0..ee509a2 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
@@ -83,7 +84,6 @@
/git-init-db
/git-interpret-trailers
/git-instaweb
-/git-legacy-stash
/git-log
/git-ls-files
/git-ls-remote
@@ -189,6 +189,7 @@
/gitweb/gitweb.cgi
/gitweb/static/gitweb.js
/gitweb/static/gitweb.min.*
+/config-list.h
/command-list.h
*.tar.gz
*.dsc
diff --git a/.travis.yml b/.travis.yml
index fc5730b..05f3e3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
matrix:
include:
- - env: jobname=GIT_TEST_GETTEXT_POISON
+ - env: jobname=GETTEXT_POISON
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/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index ed4e443..227f46a 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) {
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 8fe829c..15d9d04 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -30,6 +30,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
@@ -149,32 +150,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
diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index aa828df..c3f2d1a 100644
--- a/Documentation/MyFirstObjectWalk.txt
+++ b/Documentation/MyFirstObjectWalk.txt
@@ -357,9 +357,6 @@
...
while ((commit = get_revision(rev))) {
- if (!commit)
- continue;
-
strbuf_reset(&prettybuf);
pp_commit_easy(CMIT_FMT_ONELINE, commit, &prettybuf);
puts(prettybuf.buf);
diff --git a/Documentation/RelNotes/2.17.4.txt b/Documentation/RelNotes/2.17.4.txt
new file mode 100644
index 0000000..7d794ca
--- /dev/null
+++ b/Documentation/RelNotes/2.17.4.txt
@@ -0,0 +1,16 @@
+Git v2.17.4 Release Notes
+=========================
+
+This release is to address the security issue: CVE-2020-5260
+
+Fixes since v2.17.3
+-------------------
+
+ * With a crafted URL that contains a newline in it, the credential
+ helper machinery can be fooled to give credential information for
+ a wrong host. The attack has been made impossible by forbidding
+ a newline character in any value passed via the credential
+ protocol.
+
+Credit for finding the vulnerability goes to Felix Wilhelm of Google
+Project Zero.
diff --git a/Documentation/RelNotes/2.17.5.txt b/Documentation/RelNotes/2.17.5.txt
new file mode 100644
index 0000000..2abb821
--- /dev/null
+++ b/Documentation/RelNotes/2.17.5.txt
@@ -0,0 +1,22 @@
+Git v2.17.5 Release Notes
+=========================
+
+This release is to address a security issue: CVE-2020-11008
+
+Fixes since v2.17.4
+-------------------
+
+ * With a crafted URL that contains a newline or empty host, or lacks
+ a scheme, the credential helper machinery can be fooled into
+ providing credential information that is not appropriate for the
+ protocol in use and host being contacted.
+
+ Unlike the vulnerability CVE-2020-5260 fixed in v2.17.4, the
+ credentials are not for a host of the attacker's choosing; instead,
+ they are for some unspecified host (based on how the configured
+ credential helper handles an absent "host" parameter).
+
+ The attack has been made impossible by refusing to work with
+ under-specified credential patterns.
+
+Credit for finding the vulnerability goes to Carlo Arenas.
diff --git a/Documentation/RelNotes/2.18.3.txt b/Documentation/RelNotes/2.18.3.txt
new file mode 100644
index 0000000..25143f0
--- /dev/null
+++ b/Documentation/RelNotes/2.18.3.txt
@@ -0,0 +1,5 @@
+Git v2.18.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.18.4.txt b/Documentation/RelNotes/2.18.4.txt
new file mode 100644
index 0000000..e8ef858
--- /dev/null
+++ b/Documentation/RelNotes/2.18.4.txt
@@ -0,0 +1,5 @@
+Git v2.18.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.19.4.txt b/Documentation/RelNotes/2.19.4.txt
new file mode 100644
index 0000000..35d0ae5
--- /dev/null
+++ b/Documentation/RelNotes/2.19.4.txt
@@ -0,0 +1,5 @@
+Git v2.19.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.19.5.txt b/Documentation/RelNotes/2.19.5.txt
new file mode 100644
index 0000000..18a4dcb
--- /dev/null
+++ b/Documentation/RelNotes/2.19.5.txt
@@ -0,0 +1,5 @@
+Git v2.19.5 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.20.3.txt b/Documentation/RelNotes/2.20.3.txt
new file mode 100644
index 0000000..f6eccd1
--- /dev/null
+++ b/Documentation/RelNotes/2.20.3.txt
@@ -0,0 +1,5 @@
+Git v2.20.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.20.4.txt b/Documentation/RelNotes/2.20.4.txt
new file mode 100644
index 0000000..5a9e24e
--- /dev/null
+++ b/Documentation/RelNotes/2.20.4.txt
@@ -0,0 +1,5 @@
+Git v2.20.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.21.2.txt b/Documentation/RelNotes/2.21.2.txt
new file mode 100644
index 0000000..a0fb83b
--- /dev/null
+++ b/Documentation/RelNotes/2.21.2.txt
@@ -0,0 +1,5 @@
+Git v2.21.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.21.3.txt b/Documentation/RelNotes/2.21.3.txt
new file mode 100644
index 0000000..2ca0aa5
--- /dev/null
+++ b/Documentation/RelNotes/2.21.3.txt
@@ -0,0 +1,5 @@
+Git v2.21.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.22.3.txt b/Documentation/RelNotes/2.22.3.txt
new file mode 100644
index 0000000..57296f6
--- /dev/null
+++ b/Documentation/RelNotes/2.22.3.txt
@@ -0,0 +1,5 @@
+Git v2.22.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.22.4.txt b/Documentation/RelNotes/2.22.4.txt
new file mode 100644
index 0000000..8b5f3e3
--- /dev/null
+++ b/Documentation/RelNotes/2.22.4.txt
@@ -0,0 +1,5 @@
+Git v2.22.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.23.2.txt b/Documentation/RelNotes/2.23.2.txt
new file mode 100644
index 0000000..b697cbe
--- /dev/null
+++ b/Documentation/RelNotes/2.23.2.txt
@@ -0,0 +1,5 @@
+Git v2.23.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.23.3.txt b/Documentation/RelNotes/2.23.3.txt
new file mode 100644
index 0000000..2e35490
--- /dev/null
+++ b/Documentation/RelNotes/2.23.3.txt
@@ -0,0 +1,5 @@
+Git v2.23.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.24.2.txt b/Documentation/RelNotes/2.24.2.txt
new file mode 100644
index 0000000..0049f65
--- /dev/null
+++ b/Documentation/RelNotes/2.24.2.txt
@@ -0,0 +1,5 @@
+Git v2.24.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.24.3.txt b/Documentation/RelNotes/2.24.3.txt
new file mode 100644
index 0000000..5302e0f
--- /dev/null
+++ b/Documentation/RelNotes/2.24.3.txt
@@ -0,0 +1,5 @@
+Git v2.24.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.25.3.txt b/Documentation/RelNotes/2.25.3.txt
new file mode 100644
index 0000000..15f7f21
--- /dev/null
+++ b/Documentation/RelNotes/2.25.3.txt
@@ -0,0 +1,5 @@
+Git v2.25.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.25.4.txt b/Documentation/RelNotes/2.25.4.txt
new file mode 100644
index 0000000..0dbb5da
--- /dev/null
+++ b/Documentation/RelNotes/2.25.4.txt
@@ -0,0 +1,5 @@
+Git v2.25.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.26.1.txt b/Documentation/RelNotes/2.26.1.txt
new file mode 100644
index 0000000..1b4ecb3
--- /dev/null
+++ b/Documentation/RelNotes/2.26.1.txt
@@ -0,0 +1,5 @@
+Git v2.26.1 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.26.2.txt b/Documentation/RelNotes/2.26.2.txt
new file mode 100644
index 0000000..d434d0c
--- /dev/null
+++ b/Documentation/RelNotes/2.26.2.txt
@@ -0,0 +1,5 @@
+Git v2.26.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt
new file mode 100644
index 0000000..e3121d0
--- /dev/null
+++ b/Documentation/RelNotes/2.27.0.txt
@@ -0,0 +1,501 @@
+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.
+
+
+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.
+
+
+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).
+
+ * 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/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/config.txt b/Documentation/config.txt
index 08b13ba..ef0768b 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
@@ -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
~~~~~~
@@ -447,6 +448,8 @@
include::config/tag.txt[]
+include::config/tar.txt[]
+
include::config/trace2.txt[]
include::config/transfer.txt[]
diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt
index 60fb318..9d01641 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
diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt
index 875f8c8..4e3a5c0 100644
--- a/Documentation/config/feature.txt
+++ b/Documentation/config/feature.txt
@@ -12,9 +12,6 @@
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.
+
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index f119402..b1a9b14 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
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 45c7bd5..564e809 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],
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index e806033..3968fbb 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 overriden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
+ environment variable.
+
+http.proxySSLCAInfo::
+ Pathname to the file containing the certificate bundle that should be used to
+ verify the proxy with when using an HTTPS proxy. Can be overriden by the
+ `GIT_PROXY_SSL_CAINFO` environment variable.
+
http.emptyAuth::
Attempt authentication without seeking a username or password. This
can be used to attempt GSS-Negotiate authentication without specifying
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/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/pack.txt b/Documentation/config/pack.txt
index 0dac580..837f1b1 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`.
diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt
index 756591d..0b40141 100644
--- a/Documentation/config/protocol.txt
+++ b/Documentation/config/protocol.txt
@@ -48,7 +48,7 @@
If set, clients will attempt to communicate with a server
using the specified protocol version. If the server does
not support it, communication falls back to version 0.
- If unset, the default is `2`.
+ If unset, the default is `0`.
Supported versions:
+
--
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index 0a7aa32..f5e5b38 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -112,3 +112,5 @@
is 'no' then default behavior of ignoring submodules when pushing
is retained. You may override this configuration at time of push by
specifying '--recurse-submodules=check|on-demand|no'.
+ If not set, 'no' is used by default, unless 'submodule.recurse' is
+ set (in which case a 'true' value means 'on-demand').
diff --git a/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..01d3afd 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
+ overriden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by
+ default.
+
trace2.destinationDebug::
Boolean. When true Git will print error messages when a
trace target destination cannot be opened for writing.
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 6926e0a..7e7eaba 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -20,7 +20,10 @@
ISO 8601::
Time and date specified by the ISO 8601 standard, for example
`2005-04-07T22:13:13`. The parser accepts a space instead of the
- `T` character as well.
+ `T` character as well. Fractional parts of a second will be ignored,
+ for example `2005-04-07T22:13:13.019` will be treated as
+ `2005-04-07T22:13:13`
+
+
NOTE: In addition, the date part is accepted in the following formats:
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index a115a1a..6e2a160 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -61,10 +61,8 @@
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.
-endif::git-pull[]
-f::
--force::
@@ -95,6 +93,7 @@
--[no-]write-commit-graph::
Write a commit-graph after fetching. This overrides the config
setting `fetch.writeCommitGraph`.
+endif::git-pull[]
-p::
--prune::
@@ -107,6 +106,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 +133,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 +153,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 +163,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,9 +179,11 @@
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
@@ -188,6 +192,7 @@
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 +205,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 +214,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..38c0852 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -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-bugreport.txt b/Documentation/git-bugreport.txt
new file mode 100644
index 0000000..7fe9aef
--- /dev/null
+++ b/Documentation/git-bugreport.txt
@@ -0,0 +1,53 @@
+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
+
+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
+ link:strftime[3] format string; the current local time will be used.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index c8fb995..5b697ee 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -292,11 +292,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.
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 83ce51a..75feeef 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -109,9 +109,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`.
--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..08d6045 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
@@ -162,6 +163,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
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt
index 28d1fee..53a6502 100644
--- a/Documentation/git-commit-graph.txt
+++ b/Documentation/git-commit-graph.txt
@@ -57,11 +57,23 @@
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 it's 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>`.
++
+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..a3baea3 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -348,13 +348,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-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..8d990e9 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-fast-import.txt b/Documentation/git-fast-import.txt
index 7889f95..77c6b3d 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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 0d4f895..0f81d04 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -24,6 +24,7 @@
[(--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>]]
@@ -253,6 +254,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-grep.txt b/Documentation/git-grep.txt
index ddb6acc..a7f9bc9 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 git-config(1)).
-o::
--only-matching::
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 32880aa..adc6adf 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -10,7 +10,7 @@
--------
[verse]
'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
- [--separate-git-dir <git dir>]
+ [--separate-git-dir <git dir>] [--object-format=<format]
[--shared[=<permissions>]] [directory]
@@ -48,6 +48,11 @@
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.
+
--template=<template_directory>::
Specify the directory from which templates will be used. (See the "TEMPLATE
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index bed09bb..20e6d21 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -43,12 +43,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
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 8461c0e..3cb2ebb 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -148,7 +148,7 @@
top directory.
--recurse-submodules::
- Recursively calls ls-files on each submodule in the repository.
+ Recursively calls ls-files on each active submodule in the repository.
Currently there is only support for the --cached mode.
--abbrev[=<n>]::
diff --git a/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-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index 642d9ac..0c66194 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -56,6 +56,9 @@
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-p4.txt b/Documentation/git-p4.txt
index 3494a1d..dab9609 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 supressed by the `--no-verify` option. This hook
+is called even if `--prepare-p4-only` is set.
+
+p4-changelist
+~~~~~~~~~~~~~
+
+The `p4-changelist` hook is executed after the changelist
+message has been edited by the user. It can be bypassed with the
+`--no-verify` option. It takes a single parameter, the name
+of the file that holds the proposed changelist text. Exiting
+with a non-zero status causes the command to abort.
+
+The hook is allowed to edit the changelist file and can be used
+to normalize the text into some project standard format. It can
+also be used to refuse the Submit after inspect the message file.
+
+p4-post-changelist
+~~~~~~~~~~~~~~~~~~
+
+The `p4-post-changelist` hook is invoked after the submit has
+successfully occured in P4. It takes no parameters and is meant
+primarily for notification and cannot affect the outcome of the
+git p4 submit action.
+
+
+
Rebase options
~~~~~~~~~~~~~~
These options can be used to modify 'git p4 rebase' behavior.
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index fecdf26..eaa2f2a 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
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-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..4624cfd 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -256,7 +256,8 @@
--quit::
Abort the rebase operation but HEAD is not reset back to the
original branch. The index and working tree are also left
- unchanged as a result.
+ unchanged as a result. If a temporary stash entry was created
+ using --autostash, it will be saved to the stash list.
--apply:
Use applying strategies to rebase (calling `git-am`
@@ -277,20 +278,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 +386,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,12 +449,14 @@
<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::
--whitespace=<option>::
@@ -587,8 +624,9 @@
* --preserve-merges
* --interactive
* --exec
- * --keep-empty
+ * --no-keep-empty
* --empty=
+ * --reapply-cherry-picks
* --edit-todo
* --root when used in combination with --onto
@@ -600,12 +638,13 @@
* --preserve-merges and --empty=
* --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 +659,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 +726,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 +1052,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-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..84c6c40 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,8 @@
tree. It is common to specify the source tree by naming a
commit, branch or tag associated with it.
+
-If not specified, the default restore source for the working tree is
-the index, and the default restore source for the index is
-`HEAD`. When both `--staged` and `--worktree` are specified,
-`--source` must also be specified.
+If not specified, the contents are restored from `HEAD` if `--staged` is
+given, otherwise from the index.
-p::
--patch::
@@ -107,6 +104,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-revert.txt b/Documentation/git-revert.txt
index 9d22270..044276e 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -90,9 +90,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`.
-s::
--signoff::
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index c0342e5..1a3ace6 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
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 1979003..3759c3a 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -181,9 +181,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-update-ref.txt b/Documentation/git-update-ref.txt
index 9671423..3e737c2 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,31 @@
verify::
Verify <ref> against <oldvalue> but do not change it. If
- <oldvalue> zero or missing, the ref must not exist.
+ <oldvalue> is zero or missing, the ref must not exist.
option::
Modify behavior of the next command naming a <ref>.
The only valid option is `no-deref` to avoid dereferencing
a symbolic ref.
+start::
+ Start a transaction. In contrast to a non-transactional session, a
+ transaction will automatically abort if the session ends without an
+ explicit commit.
+
+prepare::
+ Prepare to commit the transaction. This will create lock files for all
+ queued reference updates. If one reference could not be locked, the
+ transaction will be aborted.
+
+commit::
+ Commit all reference updates queued for the transaction, ending the
+ transaction.
+
+abort::
+ Abort the transaction, releasing all locks if the transaction is in
+ prepared state.
+
If all <ref>s can be locked with matching <oldvalue>s
simultaneously, all modifications are performed. Otherwise, no
modifications are performed. Note that while each individual
diff --git a/Documentation/git.txt b/Documentation/git.txt
index b0672bd..9d6769e 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -493,6 +493,12 @@
details. This variable has lower precedence than other path
variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
+`GIT_DEFAULT_HASH_ALGORITHM`::
+ 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".
+
Git Commits
~~~~~~~~~~~
`GIT_AUTHOR_NAME`::
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 508fe71..2d0a037 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -824,6 +824,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..9e481ae 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -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/gitfaq.txt b/Documentation/gitfaq.txt
new file mode 100644
index 0000000..370d62d
--- /dev/null
+++ b/Documentation/gitfaq.txt
@@ -0,0 +1,355 @@
+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].
+
+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.
+
+[[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..81f2a87 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -522,12 +522,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 supressed by the `--no-verify` option. This hook
+is called even if `--prepare-p4-only` is set.
+
+Run `git-p4 submit --help` for details.
+
+p4-post-changelist
+~~~~~~~~~~~~~~~~~~
+
+This hook is invoked by `git-p4 submit`.
+
+The `p4-post-changelist` hook is invoked after the submit has
+successfully occured in P4. It takes no parameters and is meant
+primarily for notification and cannot affect the outcome of the
+git p4 submit action.
+
+Run `git-p4 submit --help` for details.
+
p4-pre-submit
~~~~~~~~~~~~~
This hook is invoked by `git-p4 submit`. It takes no parameters and nothing
from standard input. Exiting with non-zero status from this script prevent
-`git-p4 submit` from launching. Run `git-p4 submit --help` for details.
+`git-p4 submit` from launching. It can be bypassed with the `--no-verify`
+command line option. Run `git-p4 submit --help` for details.
+
+
post-index-change
~~~~~~~~~~~~~~~~~
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index c476f89..f9f4e65 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -271,7 +271,8 @@
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.
+'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/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index ca43787..73be8b4 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -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:
@@ -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
--------
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..80d4831 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::
@@ -157,6 +160,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/pretty-formats.txt b/Documentation/pretty-formats.txt
index a4b6f49..547a552 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
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 7d3a60f..95ea849 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
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index bfd02ad..04ad7dd 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -342,6 +342,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 +540,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 +579,132 @@
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.
++
+The `--show-pulls` option helps with both of these issues by adding more
+merge commits to the history results. If a merge is not TREESAME to its
+first parent but is TREESAME to a later parent, then that 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
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 97f995e..1ad9506 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
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index 4f07cea..6b60855 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -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/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt
index a4f1744..1beef17 100644
--- a/Documentation/technical/commit-graph-format.txt
+++ b/Documentation/technical/commit-graph-format.txt
@@ -17,6 +17,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
@@ -93,6 +96,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 zero.
+ * 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/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/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5db483f..03d2243 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.26.0
+DEF_VER=v2.27.0-rc0
LF='
'
diff --git a/INSTALL b/INSTALL
index 22c364f..9ba33e6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -206,9 +206,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..3d3a39f 100644
--- a/Makefile
+++ b/Makefile
@@ -282,12 +282,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.
@@ -609,7 +603,6 @@
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
@@ -617,8 +610,8 @@
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,20 +674,23 @@
# ... and all the rest that could be moved out of bindir to gitexecdir
PROGRAMS += $(EXTRA_PROGRAMS)
+PROGRAM_OBJS += bugreport.o
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 += remote-testsvn.o
PROGRAM_OBJS += sh-i18n--envsubst.o
PROGRAM_OBJS += shell.o
-PROGRAM_OBJS += remote-testsvn.o
# Binary suffix, set to .exe for Windows builds
X =
PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
+TEST_BUILTINS_OBJS += test-advise.o
+TEST_BUILTINS_OBJS += test-bloom.o
TEST_BUILTINS_OBJS += test-chmtime.o
TEST_BUILTINS_OBJS += test-config.o
TEST_BUILTINS_OBJS += test-ctype.o
@@ -709,15 +705,16 @@
TEST_BUILTINS_OBJS += test-example-decorate.o
TEST_BUILTINS_OBJS += test-genrandom.o
TEST_BUILTINS_OBJS += test-genzeros.o
+TEST_BUILTINS_OBJS += test-hash-speed.o
TEST_BUILTINS_OBJS += test-hash.o
TEST_BUILTINS_OBJS += test-hashmap.o
-TEST_BUILTINS_OBJS += test-hash-speed.o
TEST_BUILTINS_OBJS += test-index-version.o
TEST_BUILTINS_OBJS += test-json-writer.o
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
TEST_BUILTINS_OBJS += test-match-trees.o
TEST_BUILTINS_OBJS += test-mergesort.o
TEST_BUILTINS_OBJS += test-mktemp.o
+TEST_BUILTINS_OBJS += test-oid-array.o
TEST_BUILTINS_OBJS += test-oidmap.o
TEST_BUILTINS_OBJS += test-online-cpus.o
TEST_BUILTINS_OBJS += test-parse-options.o
@@ -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,10 +744,10 @@
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.
@@ -788,10 +784,10 @@
# 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
@@ -815,6 +811,7 @@
XDIFF_LIB = xdiff/lib.a
VCSSVN_LIB = vcs-svn/lib.a
+GENERATED_H += config-list.h
GENERATED_H += command-list.h
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
@@ -831,15 +828,16 @@
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 += archive.o
LIB_OBJS += argv-array.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
@@ -849,9 +847,9 @@
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 +863,17 @@
LIB_OBJS += date.o
LIB_OBJS += decorate.o
LIB_OBJS += delta-islands.o
+LIB_OBJS += diff-delta.o
+LIB_OBJS += diff-lib.o
+LIB_OBJS += diff-no-index.o
+LIB_OBJS += diff.o
LIB_OBJS += diffcore-break.o
LIB_OBJS += diffcore-delta.o
LIB_OBJS += diffcore-order.o
LIB_OBJS += diffcore-pickaxe.o
LIB_OBJS += diffcore-rename.o
-LIB_OBJS += diff-delta.o
-LIB_OBJS += diff-lib.o
-LIB_OBJS += diff-no-index.o
-LIB_OBJS += diff.o
-LIB_OBJS += dir.o
LIB_OBJS += dir-iterator.o
+LIB_OBJS += dir.o
LIB_OBJS += editor.o
LIB_OBJS += entry.o
LIB_OBJS += environment.o
@@ -886,6 +884,7 @@
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
@@ -893,7 +892,6 @@
LIB_OBJS += graph.o
LIB_OBJS += grep.o
LIB_OBJS += hashmap.o
-LIB_OBJS += linear-assignment.o
LIB_OBJS += help.o
LIB_OBJS += hex.o
LIB_OBJS += ident.o
@@ -903,9 +901,10 @@
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 +913,32 @@
LIB_OBJS += mailmap.o
LIB_OBJS += match-trees.o
LIB_OBJS += mem-pool.o
-LIB_OBJS += merge.o
LIB_OBJS += merge-blobs.o
LIB_OBJS += merge-recursive.o
+LIB_OBJS += merge.o
LIB_OBJS += mergesort.o
LIB_OBJS += midx.o
LIB_OBJS += name-hash.o
LIB_OBJS += negotiator/default.o
LIB_OBJS += negotiator/skipping.o
-LIB_OBJS += notes.o
LIB_OBJS += notes-cache.o
LIB_OBJS += notes-merge.o
LIB_OBJS += notes-utils.o
+LIB_OBJS += notes.o
LIB_OBJS += object.o
+LIB_OBJS += oid-array.o
LIB_OBJS += oidmap.o
LIB_OBJS += oidset.o
-LIB_OBJS += packfile.o
-LIB_OBJS += pack-bitmap.o
LIB_OBJS += pack-bitmap-write.o
+LIB_OBJS += pack-bitmap.o
LIB_OBJS += pack-check.o
LIB_OBJS += pack-objects.o
LIB_OBJS += pack-revindex.o
LIB_OBJS += pack-write.o
+LIB_OBJS += packfile.o
LIB_OBJS += pager.o
-LIB_OBJS += parse-options.o
LIB_OBJS += parse-options-cb.o
+LIB_OBJS += parse-options.o
LIB_OBJS += patch-delta.o
LIB_OBJS += patch-ids.o
LIB_OBJS += path.o
@@ -951,12 +951,14 @@
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/files-backend.o
@@ -964,12 +966,12 @@
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,9 +980,8 @@
LIB_OBJS += serve.o
LIB_OBJS += server-info.o
LIB_OBJS += setup.o
-LIB_OBJS += sha1-array.o
-LIB_OBJS += sha1-lookup.o
LIB_OBJS += sha1-file.o
+LIB_OBJS += sha1-lookup.o
LIB_OBJS += sha1-name.o
LIB_OBJS += shallow.o
LIB_OBJS += sideband.o
@@ -990,9 +991,9 @@
LIB_OBJS += strbuf.o
LIB_OBJS += streaming.o
LIB_OBJS += string-list.o
-LIB_OBJS += submodule.o
-LIB_OBJS += submodule-config.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 +1012,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
@@ -1055,9 +1056,9 @@
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.o
@@ -1088,13 +1089,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 +1115,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
@@ -1358,17 +1359,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
@@ -2133,7 +2139,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 +2159,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,16 +2347,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
+XDIFF_OBJS += xdiff/xprepare.o
+XDIFF_OBJS += xdiff/xutils.o
+VCSSVN_OBJS += vcs-svn/fast_export.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
@@ -2455,6 +2467,10 @@
git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+git-bugreport$X: bugreport.o GIT-LDFLAGS $(GITLIBS)
+ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ $(LIBS)
+
git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(IMAP_SEND_LDFLAGS) $(LIBS)
@@ -2786,7 +2802,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 +2824,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"; \
@@ -3152,9 +3168,10 @@
#
ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS)
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::
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 370269d..f3d8527 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.26.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.27.0.txt
\ No newline at end of file
diff --git a/abspath.c b/abspath.c
index 9857985..6f15a41 100644
--- a/abspath.c
+++ b/abspath.c
@@ -202,22 +202,6 @@
return retval;
}
-/*
- * Resolve `path` into an absolute, cleaned-up path. The return value
- * comes from a shared buffer.
- */
-const char *real_path(const char *path)
-{
- static struct strbuf realpath = STRBUF_INIT;
- return strbuf_realpath(&realpath, path, 1);
-}
-
-const char *real_path_if_valid(const char *path)
-{
- static struct strbuf realpath = STRBUF_INIT;
- return strbuf_realpath(&realpath, path, 0);
-}
-
char *real_pathdup(const char *path, int die_on_error)
{
struct strbuf realpath = STRBUF_INIT;
@@ -233,7 +217,7 @@
/*
* 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..29cd2fe 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -9,6 +9,7 @@
#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,
@@ -289,13 +290,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;
diff --git a/add-patch.c b/add-patch.c
index d8dafa8..d8bfe37 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -7,6 +7,7 @@
#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,
@@ -1158,9 +1159,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;
}
diff --git a/advice.c b/advice.c
index 97f3f98..f0a3d32 100644
--- a/advice.c
+++ b/advice.c
@@ -29,7 +29,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;
@@ -82,7 +81,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 +90,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 +98,58 @@
{ "pushNonFastForward", &advice_push_update_rejected }
};
-void advise(const char *advice, ...)
+static struct {
+ const char *key;
+ int enabled;
+} advice_setting[] = {
+ [ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 },
+ [ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 },
+ [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 },
+ [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 },
+ [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 },
+ [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 },
+ [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 },
+ [ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 },
+ [ADVICE_IMPLICIT_IDENTITY] = { "implicitIdentity", 1 },
+ [ADVICE_NESTED_TAG] = { "nestedTag", 1 },
+ [ADVICE_OBJECT_NAME_WARNING] = { "objectNameWarning", 1 },
+ [ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists", 1 },
+ [ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst", 1 },
+ [ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce", 1 },
+
+ /* make this an alias for backward compatibility */
+ [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward", 1 },
+
+ [ADVICE_PUSH_NON_FF_CURRENT] = { "pushNonFFCurrent", 1 },
+ [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching", 1 },
+ [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName", 1 },
+ [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected", 1 },
+ [ADVICE_RESET_QUIET_WARNING] = { "resetQuiet", 1 },
+ [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 },
+ [ADVICE_RM_HINTS] = { "rmHints", 1 },
+ [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 },
+ [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure", 1 },
+ [ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning", 1 },
+ [ADVICE_STATUS_HINTS] = { "statusHints", 1 },
+ [ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 },
+ [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 },
+ [ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor", 1 },
+};
+
+static const char turn_off_instructions[] =
+N_("\n"
+ "Disable this message with \"git config advice.%s false\"");
+
+static void vadvise(const char *advice, int display_instructions,
+ const char *key, va_list params)
{
struct strbuf buf = STRBUF_INIT;
- va_list params;
const char *cp, *np;
- va_start(params, advice);
strbuf_vaddf(&buf, advice, params);
- va_end(params);
+
+ if (display_instructions)
+ strbuf_addf(&buf, turn_off_instructions, key);
for (cp = buf.buf; *cp; cp = np) {
np = strchrnul(cp, '\n');
@@ -122,6 +163,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 +220,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 +237,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..16f2c11 100644
--- a/advice.h
+++ b/advice.h
@@ -29,14 +29,64 @@
extern int advice_waiting_for_editor;
extern int advice_graft_file_deprecated;
extern int advice_checkout_ambiguous_remote_branch_name;
-extern int advice_nested_tag;
extern int advice_submodule_alternate_error_strategy_die;
extern int advice_add_ignored_file;
extern int advice_add_empty_pathspec;
+/*
+ * To add a new advice, you need to:
+ * Define a new advice_type.
+ * Add a new entry to advice_setting array.
+ * Add the new config variable to Documentation/config/advice.txt.
+ * Call advise_if_enabled to print your advice.
+ */
+ enum advice_type {
+ ADVICE_ADD_EMBEDDED_REPO,
+ ADVICE_AM_WORK_DIR,
+ ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
+ ADVICE_COMMIT_BEFORE_MERGE,
+ ADVICE_DETACHED_HEAD,
+ ADVICE_FETCH_SHOW_FORCED_UPDATES,
+ ADVICE_GRAFT_FILE_DEPRECATED,
+ ADVICE_IGNORED_HOOK,
+ ADVICE_IMPLICIT_IDENTITY,
+ ADVICE_NESTED_TAG,
+ ADVICE_OBJECT_NAME_WARNING,
+ ADVICE_PUSH_ALREADY_EXISTS,
+ ADVICE_PUSH_FETCH_FIRST,
+ ADVICE_PUSH_NEEDS_FORCE,
+ ADVICE_PUSH_NON_FF_CURRENT,
+ ADVICE_PUSH_NON_FF_MATCHING,
+ ADVICE_PUSH_UNQUALIFIED_REF_NAME,
+ ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
+ ADVICE_PUSH_UPDATE_REJECTED,
+ ADVICE_RESET_QUIET_WARNING,
+ ADVICE_RESOLVE_CONFLICT,
+ ADVICE_RM_HINTS,
+ ADVICE_SEQUENCER_IN_USE,
+ ADVICE_SET_UPSTREAM_FAILURE,
+ ADVICE_STATUS_AHEAD_BEHIND_WARNING,
+ ADVICE_STATUS_HINTS,
+ ADVICE_STATUS_U_OPTION,
+ ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
+ ADVICE_WAITING_FOR_EDITOR,
+};
+
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
void advise(const char *advice, ...);
+
+/**
+ * Checks if advice type is enabled (can be printed to the user).
+ * Should be called before advise().
+ */
+int advice_enabled(enum advice_type type);
+
+/**
+ * Checks the visibility of the advice before printing.
+ */
+void advise_if_enabled(enum advice_type type, const char *advice, ...);
+
int error_resolve_conflict(const char *me);
void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
diff --git a/apply.c b/apply.c
index bdc008f..8bff604 100644
--- a/apply.c
+++ b/apply.c
@@ -4349,7 +4349,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;
}
@@ -4964,15 +4964,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 +5005,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 +5029,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..5ceec36 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -364,7 +364,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,7 +380,7 @@
struct archiver *ar;
const char *name;
const char *type;
- int namelen;
+ size_t namelen;
if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name)
return 0;
diff --git a/archive.c b/archive.c
index a8da0fc..fb39706 100644
--- a/archive.c
+++ b/archive.c
@@ -77,6 +77,11 @@
{
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 +90,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);
@@ -385,16 +390,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))
die(_("no such ref: %.*s"), refnamelen, name);
- free(ref);
+ } else {
+ dwim_ref(name, strlen(name), &oid, &ref);
}
if (get_oid(name, &oid))
@@ -427,6 +433,7 @@
tree = parse_tree_indirect(&tree_oid);
}
+ ar_args->refname = ref;
ar_args->tree = tree;
ar_args->commit_oid = commit_oid;
ar_args->commit = commit;
diff --git a/archive.h b/archive.h
index e60e3dd..3bd96bf 100644
--- a/archive.h
+++ b/archive.h
@@ -8,6 +8,7 @@
struct archiver_args {
struct repository *repo;
+ const char *refname;
const char *base;
size_t baselen;
struct tree *tree;
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/bisect.c b/bisect.c
index 9154f81..d5e8304 100644
--- a/bisect.c
+++ b/bisect.c
@@ -10,7 +10,7 @@
#include "run-command.h"
#include "log-tree.h"
#include "bisect.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "argv-array.h"
#include "commit-slab.h"
#include "commit-reach.h"
@@ -473,7 +473,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;
@@ -765,7 +765,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 +796,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"
diff --git a/blame.c b/blame.c
index 29770e5..da7e288 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;
@@ -1246,13 +1248,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 (origin->commit->generation == GENERATION_NUMBER_INFINITY)
+ return 1;
+
+ filter = get_bloom_filter(r, origin->commit, 0);
+
+ 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 +1349,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 &&
+ !oidcmp(&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 +1412,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 +1438,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;
@@ -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;
@@ -2356,8 +2434,7 @@
* 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)) {
@@ -2809,3 +2886,45 @@
blame_origin_incref(o);
return new_head;
}
+
+void setup_blame_bloom_data(struct blame_scoreboard *sb,
+ const char *path)
+{
+ struct blame_bloom_data *bd;
+
+ if (!sb->repo->objects->commit_graph)
+ return;
+
+ if (!sb->repo->objects->commit_graph->bloom_filter_settings)
+ return;
+
+ bd = xmalloc(sizeof(struct blame_bloom_data));
+
+ bd->settings = sb->repo->objects->commit_graph->bloom_filter_settings;
+
+ bd->alloc = 4;
+ bd->nr = 0;
+ ALLOC_ARRAY(bd->keys, bd->alloc);
+
+ add_bloom_key(bd, path);
+
+ sb->bloom_data = bd;
+}
+
+void cleanup_scoreboard(struct blame_scoreboard *sb)
+{
+ if (sb->bloom_data) {
+ int i;
+ for (i = 0; i < sb->bloom_data->nr; i++) {
+ free(sb->bloom_data->keys[i]->hashes);
+ free(sb->bloom_data->keys[i]);
+ }
+ free(sb->bloom_data->keys);
+ FREE_AND_NULL(sb->bloom_data);
+
+ trace2_data_intmax("blame", sb->repo,
+ "bloom/queries", bloom_count_queries);
+ trace2_data_intmax("blame", sb->repo,
+ "bloom/response-no", bloom_count_no);
+ }
+}
diff --git a/blame.h b/blame.h
index 089b181..b6bbee4 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;
};
/*
@@ -180,6 +183,9 @@
void setup_scoreboard(struct blame_scoreboard *sb,
const char *path,
struct blame_origin **orig);
+void setup_blame_bloom_data(struct blame_scoreboard *sb,
+ const char *path);
+void cleanup_scoreboard(struct blame_scoreboard *sb);
struct blame_entry *blame_entry_prepend(struct blame_entry *head,
long start, long end,
diff --git a/bloom.c b/bloom.c
new file mode 100644
index 0000000..9b86aa3
--- /dev/null
+++ b/bloom.c
@@ -0,0 +1,296 @@
+#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;
+
+ while (c->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 = c->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 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);
+}
+
+struct bloom_filter *get_bloom_filter(struct repository *r,
+ struct commit *c,
+ int compute_if_not_present)
+{
+ struct bloom_filter *filter;
+ struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
+ int i;
+ struct diff_options diffopt;
+ int max_changes = 512;
+
+ if (bloom_filters.slab_size == 0)
+ return NULL;
+
+ filter = bloom_filter_slab_at(&bloom_filters, c);
+
+ if (!filter->data) {
+ load_commit_graph_info(r, c);
+ if (c->graph_pos != COMMIT_NOT_FROM_GRAPH &&
+ r->objects->commit_graph->chunk_bloom_indexes) {
+ if (load_bloom_filter_from_graph(r->objects->commit_graph, filter, c))
+ return filter;
+ else
+ return NULL;
+ }
+ }
+
+ if (filter->data || !compute_if_not_present)
+ return filter;
+
+ repo_diff_setup(r, &diffopt);
+ diffopt.flags.recursive = 1;
+ diffopt.detect_rename = 0;
+ diffopt.max_changes = max_changes;
+ 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 (diffopt.num_changes <= max_changes) {
+ struct hashmap pathmap;
+ struct pathmap_hash_entry *e;
+ struct hashmap_iter iter;
+ hashmap_init(&pathmap, pathmap_cmp, NULL, 0);
+
+ for (i = 0; i < diff_queued_diff.nr; i++) {
+ const char *path = diff_queued_diff.queue[i]->two->path;
+
+ /*
+ * Add each leading directory of the changed file, i.e. for
+ * 'dir/subdir/file' add 'dir' and 'dir/subdir' as well, so
+ * the Bloom filter could be used to speed up commands like
+ * 'git log dir/subdir', too.
+ *
+ * Note that directories are added without the trailing '/'.
+ */
+ do {
+ char *last_slash = strrchr(path, '/');
+
+ FLEX_ALLOC_STR(e, path, path);
+ hashmap_entry_init(&e->entry, strhash(path));
+
+ if (!hashmap_get(&pathmap, &e->entry, NULL))
+ hashmap_add(&pathmap, &e->entry);
+ else
+ free(e);
+
+ if (!last_slash)
+ last_slash = (char*)path;
+ *last_slash = '\0';
+
+ } while (*path);
+
+ diff_free_filepair(diff_queued_diff.queue[i]);
+ }
+
+ filter->len = (hashmap_get_size(&pathmap) * settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
+ filter->data = xcalloc(filter->len, sizeof(unsigned char));
+
+ hashmap_for_each_entry(&pathmap, &iter, e, entry) {
+ struct bloom_key key;
+ fill_bloom_key(e->path, strlen(e->path), &key, &settings);
+ add_key_to_filter(&key, filter, &settings);
+ }
+
+ hashmap_free_entries(&pathmap, struct pathmap_hash_entry, entry);
+ } else {
+ for (i = 0; i < diff_queued_diff.nr; i++)
+ diff_free_filepair(diff_queued_diff.queue[i]);
+ filter->data = NULL;
+ filter->len = 0;
+ }
+
+ 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..b2a8379
--- /dev/null
+++ b/bloom.h
@@ -0,0 +1,90 @@
+#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;
+};
+
+#define DEFAULT_BLOOM_FILTER_SETTINGS { 1, 7, 10 }
+#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 add_key_to_filter(const struct bloom_key *key,
+ struct bloom_filter *filter,
+ const struct bloom_filter_settings *settings);
+
+void init_bloom_filters(void);
+
+struct bloom_filter *get_bloom_filter(struct repository *r,
+ struct commit *c,
+ int compute_if_not_present);
+
+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..2d9e767 100644
--- a/branch.c
+++ b/branch.c
@@ -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)
diff --git a/bugreport.c b/bugreport.c
new file mode 100644
index 0000000..aa8a489
--- /dev/null
+++ b/bugreport.c
@@ -0,0 +1,192 @@
+#include "cache.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;
+
+ /* 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);
+}
+
+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_main(int argc, const char **argv)
+{
+ struct strbuf buffer = STRBUF_INIT;
+ struct strbuf report_path = STRBUF_INIT;
+ int report = -1;
+ time_t now = time(NULL);
+ char *option_output = NULL;
+ char *option_suffix = "%Y-%m-%d-%H%M";
+ int nongit_ok = 0;
+ const char *prefix = NULL;
+ 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()
+ };
+
+ prefix = setup_git_directory_gently(&nongit_ok);
+
+ argc = parse_options(argc, argv, prefix, bugreport_options,
+ bugreport_usage, 0);
+
+ /* Prepare the path to put the result */
+ strbuf_addstr(&report_path,
+ prefix_filename(prefix,
+ option_output ? option_output : ""));
+ strbuf_complete(&report_path, '/');
+
+ strbuf_addstr(&report_path, "git-bugreport-");
+ strbuf_addftime(&report_path, option_suffix, localtime(&now), 0, 0);
+ strbuf_addstr(&report_path, ".txt");
+
+ switch (safe_create_leading_directories(report_path.buf)) {
+ case SCLD_OK:
+ case SCLD_EXISTS:
+ break;
+ default:
+ die(_("could not create leading directories for '%s'"),
+ report_path.buf);
+ }
+
+ /* Prepare the report contents */
+ get_bug_template(&buffer);
+
+ get_header(&buffer, _("System Info"));
+ get_system_info(&buffer);
+
+ get_header(&buffer, _("Enabled Hooks"));
+ get_populated_hooks(&buffer, nongit_ok);
+
+ /* 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) {
+ UNLEAK(report_path);
+ die(_("couldn't create a new file at '%s'"), report_path.buf);
+ }
+
+ strbuf_write_fd(&buffer, report);
+ 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.h b/builtin.h
index 2b25a80..a5ae15b 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
diff --git a/builtin/add.c b/builtin/add.c
index 18a0881..298e011 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -330,10 +330,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")),
diff --git a/builtin/am.c b/builtin/am.c
index e3dfd93..69e50de 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1691,7 +1691,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 +1795,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_gc(state->quiet);
}
}
diff --git a/builtin/blame.c b/builtin/blame.c
index bf1cecd..94ef57c 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -864,8 +864,8 @@
OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")),
- { OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback },
- { OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback },
+ OPT_CALLBACK_F('C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback),
+ OPT_CALLBACK_F('M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback),
OPT_STRING_LIST('L', NULL, &range_list, N_("n,m"), N_("Process only line range n,m, counting from 1")),
OPT__ABBREV(&abbrev),
OPT_END()
@@ -1061,6 +1061,14 @@
string_list_clear(&ignore_revs_file_list, 0);
string_list_clear(&ignore_rev_list, 0);
setup_scoreboard(&sb, path, &o);
+
+ /*
+ * Changed-path Bloom filters are disabled when looking
+ * for copies.
+ */
+ if (!(opt & PICKAXE_BLAME_COPY))
+ setup_blame_bloom_data(&sb, path);
+
lno = sb.num_lines;
if (lno && !range_list.nr)
@@ -1164,5 +1172,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..accb61b 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -653,10 +653,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(),
@@ -739,7 +737,7 @@
*/
if (!sorting)
sorting = ref_default_sorting();
- sorting->ignore_case = icase;
+ ref_sorting_icase_all(sorting, icase);
print_ref_list(&filter, sorting, &format);
print_columns(&output, colopts, NULL);
string_list_clear(&output, 0);
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 272f9fc..ae18e20 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);
@@ -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/checkout-index.c b/builtin/checkout-index.c
index 1ac1cc2..a854fd1 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -177,9 +177,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()
};
diff --git a/builtin/checkout.c b/builtin/checkout.c
index d677381..e9d111b 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)
{
@@ -337,7 +350,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 +362,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 +414,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;
@@ -462,7 +480,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(new_branch_info->name, patch_mode, &opts->pathspec);
}
repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
@@ -523,7 +541,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 +604,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 +620,11 @@
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 :
+ is_null_oid(&info->oid) ? &tree->object.oid :
+ &info->oid,
+ NULL);
parse_tree(tree);
init_tree_desc(&tree_desc, tree->buffer, tree->size);
switch (unpack_trees(1, &tree_desc, &opts)) {
@@ -620,21 +644,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))
+ 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 +683,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 +712,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;
@@ -762,7 +786,7 @@
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 +806,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)
@@ -1462,9 +1486,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 +1544,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 +1589,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 +1609,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 +1626,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 +1635,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;
}
@@ -1710,7 +1738,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 +1826,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..4ca12bc 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;
@@ -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;
}
@@ -662,9 +660,7 @@
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 */
@@ -760,9 +756,7 @@
qname = quote_path_relative(item->string, NULL, &buf);
/* 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")),
@@ -989,12 +983,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);
diff --git a/builtin/clone.c b/builtin/clone.c
index 1ad26f4..cb48a29 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -102,10 +102,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 +420,7 @@
struct dir_iterator *iter;
int iter_status;
unsigned int flags;
+ struct strbuf realpath = STRBUF_INIT;
mkdir_if_missing(dest->buf, 0777);
@@ -454,7 +455,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 +470,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 +643,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 +678,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 +687,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"));
@@ -780,11 +783,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 +802,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 +810,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"));
@@ -1102,7 +1108,7 @@
}
}
- init_db(git_dir, real_git_dir, option_template, INIT_DB_QUIET);
+ init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, INIT_DB_QUIET);
if (real_git_dir)
git_dir = real_git_dir;
@@ -1275,7 +1281,7 @@
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);
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 4a70b33..15fe603 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -9,7 +9,9 @@
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-]progress] <split options>"),
NULL
};
@@ -19,7 +21,9 @@
};
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-]progress] <split options>"),
NULL
};
@@ -32,6 +36,7 @@
int split;
int shallow;
int progress;
+ int enable_changed_paths;
} opts;
static struct object_directory *find_odb(struct repository *r,
@@ -39,14 +44,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);
@@ -111,10 +119,29 @@
extern int read_replace_refs;
static struct split_commit_graph_opts split_opts;
+static int write_option_parse_split(const struct option *opt, const char *arg,
+ int unset)
+{
+ enum commit_graph_split_flags *flags = opt->value;
+
+ 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 graph_write(int argc, const char **argv)
{
struct string_list *pack_indexes = NULL;
- struct string_list *commit_hex = NULL;
+ struct oidset commits = OIDSET_INIT;
struct object_directory *odb = NULL;
struct string_list lines;
int result = 0;
@@ -132,15 +159,19 @@
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_CALLBACK_F(0, "split", &split_opts.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", &split_opts.max_commits,
N_("maximum number of commits in a non-base split commit-graph")),
OPT_INTEGER(0, "size-multiple", &split_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")),
+ N_("only expire files older than a given date-time")),
OPT_END(),
};
@@ -165,6 +196,9 @@
flags |= COMMIT_GRAPH_WRITE_SPLIT;
if (opts.progress)
flags |= COMMIT_GRAPH_WRITE_PROGRESS;
+ if (opts.enable_changed_paths ||
+ 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);
@@ -185,7 +219,20 @@
if (opts.stdin_packs)
pack_indexes = &lines;
if (opts.stdin_commits) {
- commit_hex = &lines;
+ struct string_list_item *item;
+ oidset_init(&commits, lines.nr);
+ for_each_string_list_item(item, &lines) {
+ struct object_id oid;
+ const char *end;
+
+ if (parse_oid_hex(item->string, &oid, &end)) {
+ error(_("unexpected non-hex object ID: "
+ "%s"), item->string);
+ return 1;
+ }
+
+ oidset_insert(&commits, &oid);
+ }
flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
}
@@ -194,7 +241,7 @@
if (write_commit_graph(odb,
pack_indexes,
- commit_hex,
+ opts.stdin_commits ? &commits : NULL,
flags,
&split_opts))
result = 1;
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..d1b7396 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;
@@ -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";
}
@@ -973,12 +972,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;
}
@@ -1181,8 +1183,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 +1208,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 +1218,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);
}
@@ -1366,9 +1372,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 +1393,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 +1494,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")),
@@ -1631,8 +1636,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 +1666,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;
@@ -1692,12 +1699,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_gc(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 +1718,8 @@
&oid, flags);
}
+ apply_autostash(git_path_merge_autostash(the_repository));
+
UNLEAK(err);
UNLEAK(sb);
return 0;
diff --git a/builtin/describe.c b/builtin/describe.c
index 420f4c6..21d2cb9 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -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);
@@ -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);
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index cb9ea79..802363d 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -109,6 +109,7 @@
struct object *tree1, *tree2;
static struct rev_info *opt = &log_tree_opt;
struct setup_revision_opt s_r_opt;
+ struct userformat_want w;
int read_stdin = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
@@ -127,6 +128,14 @@
precompose_argv(argc, argv);
argc = setup_revisions(argc, argv, opt, &s_r_opt);
+ memset(&w, 0, sizeof(w));
+ userformat_find_requirements(NULL, &w);
+
+ if (!opt->show_notes_given && w.notes)
+ opt->show_notes = 1;
+ if (opt->show_notes)
+ load_display_notes(&opt->notes_opt);
+
while (--argc > 0) {
const char *arg = *++argv;
diff --git a/builtin/diff.c b/builtin/diff.c
index 42ac803..8537b17 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -17,7 +17,7 @@
#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
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index dc1485c..4771100 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[] =
diff --git a/builtin/fetch.c b/builtin/fetch.c
index bf6bab8..b5788c1 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -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)
@@ -156,9 +157,9 @@
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('k', "keep", &keep, N_("keep downloaded pack")),
@@ -178,15 +179,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),
@@ -908,13 +909,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);
@@ -1759,7 +1753,6 @@
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");
@@ -1886,13 +1879,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_gc(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..57489e4 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -70,7 +70,7 @@
if (!sorting)
sorting = ref_default_sorting();
- sorting->ignore_case = icase;
+ ref_sorting_icase_all(sorting, icase);
filter.ignore_case = icase;
filter.name_patterns = argv;
diff --git a/builtin/grep.c b/builtin/grep.c
index 99e2685..a5056f3 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -295,6 +295,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_relative(filename + tree_name_len, opt->prefix, out);
+ 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 +334,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 +360,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);
@@ -679,8 +701,6 @@
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;
@@ -886,20 +906,20 @@
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,
diff --git a/builtin/help.c b/builtin/help.c
index e5590d7..299206e 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;
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index d967d18..f176dd2 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1368,9 +1368,8 @@
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);
}
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 944ec77..0b7222e 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -20,6 +20,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 +178,36 @@
return 1;
}
+void initialize_repository_version(int hash_algo)
+{
+ char repo_version_string[10];
+ int repo_version = GIT_REPO_VERSION;
+
+#ifndef ENABLE_SHA256
+ if (hash_algo != GIT_HASH_SHA1)
+ die(_("The hash algorithm %s is not supported in this build."), hash_algos[hash_algo].name);
+#endif
+
+ 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);
+}
+
static int create_default_files(const char *template_path,
- const char *original_git_dir)
+ const char *original_git_dir,
+ const struct repository_format *fmt)
{
struct stat st1;
struct strbuf buf = STRBUF_INIT;
char *path;
- char repo_version_string[10];
char junk[2];
int reinit;
int filemode;
@@ -244,10 +269,7 @@
exit(1);
}
- /* 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);
/* Check filemode trustability */
path = git_path_buf(&buf, "config");
@@ -340,12 +362,33 @@
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, 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 +399,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 +421,11 @@
* 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, &repo_fmt);
create_object_directory();
@@ -482,6 +527,8 @@
const char *work_tree;
const char *template_dir = NULL;
unsigned int flags = 0;
+ const char *object_format = 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,6 +541,8 @@
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(0, "object-format", &object_format, N_("hash"),
+ N_("specify the hash algorithm to use")),
OPT_END()
};
@@ -546,6 +595,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);
@@ -597,5 +652,5 @@
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, 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..d104d5c 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -46,6 +46,7 @@
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;
@@ -151,6 +152,7 @@
rev->show_root_diff = default_show_root;
rev->subject_prefix = fmt_patch_subject_prefix;
rev->show_signature = default_show_signature;
+ rev->encode_email_headers = default_encode_email_headers;
rev->diffopt.flags.allow_textconv = 1;
if (default_date_mode)
@@ -164,21 +166,24 @@
int quiet = 0, source = 0, mailmap;
static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
+ static struct string_list decorate_refs_exclude_config = STRING_LIST_INIT_NODUP;
static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
struct decoration_filter decoration_filter = {&decorate_refs_include,
- &decorate_refs_exclude};
+ &decorate_refs_exclude,
+ &decorate_refs_exclude_config};
static struct revision_sources revision_sources;
const struct option builtin_log_options[] = {
OPT__QUIET(&quiet, N_("suppress diff output")),
OPT_BOOL(0, "source", &source, N_("show source")),
OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
+ OPT_ALIAS(0, "mailmap", "use-mailmap"),
OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include,
N_("pattern"), N_("only decorate refs that match <pattern>")),
OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude,
N_("pattern"), N_("do not decorate refs that match <pattern>")),
- { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
- PARSE_OPT_OPTARG, decorate_callback},
+ OPT_CALLBACK_F(0, "decorate", NULL, NULL, N_("decorate options"),
+ PARSE_OPT_OPTARG, decorate_callback),
OPT_CALLBACK('L', NULL, &line_cb, "n,m:file",
N_("Process line range n,m in file, counting from 1"),
log_line_range_callback),
@@ -236,7 +241,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);
}
@@ -438,6 +455,10 @@
return git_config_string(&fmt_pretty, var, value);
if (!strcmp(var, "format.subjectprefix"))
return git_config_string(&fmt_patch_subject_prefix, var, value);
+ if (!strcmp(var, "format.encodeemailheaders")) {
+ default_encode_email_headers = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "log.abbrevcommit")) {
default_abbrev_commit = git_config_bool(var, value);
return 0;
@@ -1625,12 +1646,12 @@
int creation_factor = -1;
const struct option builtin_format_patch_options[] = {
- { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
+ OPT_CALLBACK_F('n', "numbered", &numbered, NULL,
N_("use [PATCH n/m] even with a single patch"),
- PARSE_OPT_NOARG, numbered_callback },
- { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
+ PARSE_OPT_NOARG, numbered_callback),
+ OPT_CALLBACK_F('N', "no-numbered", &numbered, NULL,
N_("use [PATCH] even with multiple patches"),
- PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback },
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback),
OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
OPT_BOOL(0, "stdout", &use_stdout,
N_("print patches to standard out")),
@@ -1644,21 +1665,21 @@
N_("start numbering patches at <n> instead of 1")),
OPT_INTEGER('v', "reroll-count", &reroll_count,
N_("mark the series as Nth re-roll")),
- { OPTION_CALLBACK, 0, "rfc", &rev, NULL,
+ OPT_CALLBACK_F(0, "rfc", &rev, NULL,
N_("Use [RFC PATCH] instead of [PATCH]"),
- PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback },
+ 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"),
+ OPT_CALLBACK_F(0, "subject-prefix", &rev, N_("prefix"),
N_("Use [<prefix>] instead of [PATCH]"),
- PARSE_OPT_NONEG, subject_prefix_callback },
- { OPTION_CALLBACK, 'o', "output-directory", &output_directory,
+ PARSE_OPT_NONEG, subject_prefix_callback),
+ OPT_CALLBACK_F('o', "output-directory", &output_directory,
N_("dir"), N_("store resulting files in <dir>"),
- PARSE_OPT_NONEG, output_directory_callback },
- { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
+ PARSE_OPT_NONEG, output_directory_callback),
+ OPT_CALLBACK_F('k', "keep-subject", &rev, NULL,
N_("don't strip/add [PATCH]"),
- PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback),
OPT_BOOL(0, "no-binary", &no_binary_diff,
N_("don't output binary diffs")),
OPT_BOOL(0, "zero-commit", &zero_commit,
@@ -1669,27 +1690,25 @@
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"),
@@ -1719,6 +1738,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;
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index f069a02..30a4c10 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -128,8 +128,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);
@@ -554,18 +555,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),
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.c b/builtin/merge.c
index d127d22..ca6a5dc 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -40,6 +40,7 @@
#include "branch.h"
#include "commit-reach.h"
#include "wt-status.h"
+#include "commit-graph.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)
@@ -82,6 +83,7 @@
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[] = {
@@ -241,9 +243,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,6 +288,7 @@
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, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
@@ -447,7 +450,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 +457,7 @@
* user should see them.
*/
close_object_store(the_repository->objects);
- run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+ run_auto_gc(verbosity < 0);
}
}
if (new_head && show_diffstat) {
@@ -475,6 +477,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);
}
@@ -597,10 +600,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;
@@ -634,6 +639,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);
@@ -1281,6 +1289,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 +1298,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;
}
@@ -1513,6 +1531,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 +1601,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);
@@ -1673,9 +1700,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/notes.c b/builtin/notes.c
index 35e468e..2987c08 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -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),
@@ -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()
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 02aa6ee..c5b433a 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -26,7 +26,7 @@
#include "pack-bitmap.h"
#include "delta-islands.h"
#include "reachable.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "argv-array.h"
#include "list.h"
#include "packfile.h"
@@ -34,6 +34,7 @@
#include "dir.h"
#include "midx.h"
#include "trace2.h"
+#include "shallow.h"
#define IN_PACK(obj) oe_in_pack(&to_pack, obj)
#define SIZE(obj) oe_size(&to_pack, obj)
@@ -880,7 +881,7 @@
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;
}
@@ -3380,9 +3381,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 +3428,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,9 +3455,9 @@
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,
@@ -3469,9 +3470,9 @@
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);
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..00e5857 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"
@@ -110,6 +110,7 @@
static char *opt_ipv6;
static int opt_show_forced_updates = -1;
static char *set_upstream;
+static struct argv_array opt_fetch = ARGV_ARRAY_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),
@@ -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,
@@ -327,6 +344,22 @@
if (!git_config_get_value("pull.rebase", &value))
return parse_config_rebase("pull.rebase", value, 1);
+ if (opt_verbosity >= 0 &&
+ (!opt_ff || strcmp(opt_ff, "--ff-only"))) {
+ warning(_("Pulling without specifying how to reconcile divergent branches is\n"
+ "discouraged. You can squelch this message by running one of the following\n"
+ "commands sometime before your next pull:\n"
+ "\n"
+ " git config pull.rebase false # merge (the default strategy)\n"
+ " git config pull.rebase true # rebase\n"
+ " git config pull.ff only # fast-forward only\n"
+ "\n"
+ "You can replace \"git config\" with \"git config --global\" to set a default\n"
+ "preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+ "or --ff-only on the command line to override the configured default per\n"
+ "invocation.\n"));
+ }
+
return REBASE_FALSE;
}
@@ -551,6 +584,7 @@
argv_array_push(&args, "--no-show-forced-updates");
if (set_upstream)
argv_array_push(&args, set_upstream);
+ argv_array_pushv(&args, opt_fetch.argv);
if (repo) {
argv_array_push(&args, repo);
@@ -661,6 +695,10 @@
argv_array_pushv(&args, opt_strategy_opts.argv);
if (opt_gpg_sign)
argv_array_push(&args, opt_gpg_sign);
+ if (opt_autostash == 0)
+ argv_array_push(&args, "--no-autostash");
+ else if (opt_autostash == 1)
+ argv_array_push(&args, "--autostash");
if (opt_allow_unrelated_histories > 0)
argv_array_push(&args, "--allow-unrelated-histories");
@@ -908,9 +946,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)
@@ -976,6 +1011,7 @@
if (opt_rebase) {
int ret = 0;
+ int ran_ff = 0;
if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
submodule_touches_in_range(the_repository, &rebase_fork_point, &curr_head))
@@ -992,10 +1028,12 @@
if (is_descendant_of(merge_head, list)) {
/* 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(&curr_head, merge_heads.oid, &rebase_fork_point);
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..bc94078 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -340,6 +340,7 @@
{
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 +358,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;
@@ -434,10 +436,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;
}
@@ -548,13 +548,11 @@
OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
- { OPTION_CALLBACK,
- 0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
- N_("require old value of ref to be at this value"),
- PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option },
- { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
- N_("control recursive pushing of submodules"),
- PARSE_OPT_OPTARG, option_parse_recurse_submodules },
+ OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
+ N_("require old value of ref to be at this value"),
+ PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),
+ OPT_CALLBACK(0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
+ N_("control recursive pushing of submodules"), option_parse_recurse_submodules),
OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),
OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")),
@@ -566,9 +564,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"),
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..37ba76a 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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>] "
@@ -85,6 +88,7 @@
const char *action;
int signoff;
int allow_rerere_autoupdate;
+ int keep_empty;
int autosquash;
char *gpg_sign_opt;
int autostash;
@@ -95,11 +99,13 @@
struct strbuf git_format_patch_opt;
int reschedule_failed_exec;
int use_legacy_rebase;
+ int reapply_cherry_picks;
};
#define REBASE_OPTIONS_INIT { \
.type = REBASE_UNSPECIFIED, \
.empty = EMPTY_UNSPECIFIED, \
+ .keep_empty = 1, \
.default_backend = "merge", \
.flags = REBASE_NO_QUIET, \
.git_am_opts = ARGV_ARRAY_INIT, \
@@ -379,11 +385,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: {
@@ -442,6 +450,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 +458,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 +477,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 +566,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 +593,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 +600,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 +619,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 +643,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 +657,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 +666,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 +675,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 +719,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
* user should see them.
*/
- run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+ run_auto_gc(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE)));
if (opts->type == REBASE_MERGE) {
struct replay_opts replay = REPLAY_OPTS_INIT;
@@ -812,143 +770,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 +785,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);
@@ -1053,8 +876,9 @@
free(rebased_patches);
argv_array_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"
@@ -1162,6 +986,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 +1037,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);
@@ -1453,7 +1278,6 @@
return 0;
}
-
int cmd_rebase(int argc, const char **argv, const char *prefix)
{
struct rebase_options options = REBASE_OPTIONS_INIT;
@@ -1526,18 +1350,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 +1370,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")),
@@ -1582,6 +1405,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 +1417,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 +1480,9 @@
die(_("cannot combine '--keep-base' with '--root'"));
}
+ if (options.root && fork_point > 0)
+ die(_("cannot combine '--root' with '--fork-point'"));
+
if (action != ACTION_NONE && !in_progress)
die(_("No rebase in progress?"));
setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
@@ -1709,8 +1540,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 +1558,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 +1568,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;
@@ -1822,10 +1654,11 @@
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;
@@ -2086,49 +1919,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 +1954,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 +2031,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 +2049,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..ea3d0f0 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -13,7 +13,7 @@
#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 "version.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>"),
@@ -418,7 +419,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 +464,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 +500,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 +562,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;
@@ -855,7 +877,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 +894,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
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 81dfd56..52ecf6d 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;
diff --git a/builtin/remote.c b/builtin/remote.c
index 555d4c8..e837799 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -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()
};
diff --git a/builtin/repack.c b/builtin/repack.c
index 0781763..df28773 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -10,8 +10,10 @@
#include "argv-array.h"
#include "midx.h"
#include "packfile.h"
+#include "prune-packed.h"
#include "object-store.h"
#include "promisor-remote.h"
+#include "shallow.h"
static int delta_base_offset = 1;
static int pack_kept_objects = -1;
diff --git a/builtin/reset.c b/builtin/reset.c
index 18228c3..8ae69d6 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);
+ 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-parse.c b/builtin/rev-parse.c
index 7a00da8..669dd2f 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
@@ -808,9 +809,10 @@
continue;
}
if (!strcmp(arg, "--show-superproject-working-tree")) {
- const char *superproject = get_superproject_working_tree();
- if (superproject)
- puts(superproject);
+ struct strbuf superproject = STRBUF_INIT;
+ if (get_superproject_working_tree(&superproject))
+ puts(superproject.buf);
+ strbuf_release(&superproject);
continue;
}
if (!strcmp(arg, "--show-prefix")) {
@@ -857,7 +859,10 @@
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;
}
}
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 098ebf2..2b9610f 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"
@@ -165,9 +165,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 +176,9 @@
OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("use stateless RPC protocol")),
OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")),
OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")),
- { OPTION_CALLBACK,
- 0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
+ OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
N_("require old value of ref to be at this value"),
- PARSE_OPT_OPTARG, parseopt_push_cas_option },
+ PARSE_OPT_OPTARG, parseopt_push_cas_option),
OPT_END()
};
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 65cd413..c856c58 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -268,9 +268,9 @@
N_("Suppress commit descriptions, only provides commit count")),
OPT_BOOL('e', "email", &log.email,
N_("Show the email address of each author")),
- { OPTION_CALLBACK, 'w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
+ OPT_CALLBACK_F('w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
N_("Linewrap output"), PARSE_OPT_OPTARG,
- &parse_wrap_args },
+ &parse_wrap_args),
OPT_END(),
};
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 8c90cbb..7e52ee9 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -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()
};
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6456da7..ae60b4a 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -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..95d0882 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -18,7 +18,7 @@
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
};
@@ -94,50 +94,37 @@
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);
-
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;
@@ -304,8 +291,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 +545,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 +554,18 @@
return modify_pattern_list(argc, argv, m);
}
+static int sparse_checkout_reapply(int argc, const char **argv)
+{
+ repo_read_index(the_repository);
+ return update_working_directory(NULL);
+}
+
static int sparse_checkout_disable(int argc, const char **argv)
{
struct pattern_list pl;
struct strbuf match_all = STRBUF_INIT;
repo_read_index(the_repository);
- require_clean_work_tree(the_repository,
- N_("disable sparse-checkout"), NULL, 1, 0);
memset(&pl, 0, sizeof(pl));
hashmap_init(&pl.recursive_hashmap, pl_hashmap_cmp, NULL, 0);
@@ -622,6 +609,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..0c52a3b 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -702,6 +702,7 @@
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 +714,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)
@@ -750,7 +755,6 @@
* any options.
*/
if (revision_args.argc == 1) {
- git_config(git_stash_config, NULL);
if (show_stat)
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
@@ -857,30 +861,23 @@
struct strbuf *untracked_files)
{
int i;
- int max_len;
int found = 0;
- char *seen;
struct dir_struct dir;
memset(&dir, 0, sizeof(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');
- }
+ found++;
+ strbuf_addstr(untracked_files, ent->name);
+ /* NUL-terminate: will be fed to update-index -z */
+ strbuf_addch(untracked_files, '\0');
free(ent);
}
- free(seen);
free(dir.entries);
free(dir.ignored);
clear_directory(&dir);
@@ -1037,7 +1034,7 @@
}
cp_diff_tree.git_cmd = 1;
- argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD",
+ argv_array_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;
@@ -1559,29 +1556,6 @@
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();
@@ -1592,21 +1566,12 @@
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);
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 86a608e..46c03d2 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -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;
@@ -557,7 +557,7 @@
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;
@@ -2246,6 +2246,37 @@
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;
+}
+
#define SUPPORT_SUPER_PREFIX (1<<0)
struct cmd_struct {
@@ -2276,6 +2307,7 @@
{"is-active", is_active, 0},
{"check-name", check_name, 0},
{"config", module_config, 0},
+ {"set-url", module_set_url, 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..5cbd80d 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"
@@ -231,8 +231,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 +410,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")),
@@ -484,7 +485,7 @@
}
if (!sorting)
sorting = ref_default_sorting();
- sorting->ignore_case = icase;
+ ref_sorting_icase_all(sorting, icase);
filter.ignore_case = icase;
if (cmdmode == 'l') {
int ret;
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..b74dd9a6 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -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,179 @@
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:
+ /* Do not downgrade a transaction to a non-transaction. */
+ if (cmd->state >= state)
+ state = cmd->state;
+ break;
+ case UPDATE_REFS_PREPARED:
+ if (cmd->state != UPDATE_REFS_CLOSED)
+ die("prepared transactions can only be closed");
+ state = cmd->state;
+ break;
+ case UPDATE_REFS_CLOSED:
+ die("transaction is closed");
+ break;
+ }
+
+ cmd->fn(transaction, input.buf + strlen(cmd->prefix) + !!cmd->args,
+ input.buf + input.len);
}
+ switch (state) {
+ case UPDATE_REFS_OPEN:
+ /* Commit by default if no transaction was requested. */
+ if (ref_transaction_commit(transaction, &err))
+ die("%s", err.buf);
+ ref_transaction_free(transaction);
+ break;
+ case UPDATE_REFS_STARTED:
+ case UPDATE_REFS_PREPARED:
+ /* If using a transaction, we want to abort it. */
+ if (ref_transaction_abort(transaction, &err))
+ die("%s", err.buf);
+ break;
+ case UPDATE_REFS_CLOSED:
+ /* Otherwise no need to do anything, the transaction was closed already. */
+ break;
+ }
+
+ strbuf_release(&err);
strbuf_release(&input);
}
@@ -384,21 +507,11 @@
}
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/worktree.c b/builtin/worktree.c
index 24f2280..d99db35 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -258,7 +258,7 @@
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;
@@ -330,9 +330,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
@@ -418,6 +420,7 @@
strbuf_release(&sb_repo);
strbuf_release(&sb_git);
strbuf_release(&sb_name);
+ strbuf_release(&realpath);
return ret;
}
diff --git a/cache.h b/cache.h
index 37c899b..0f0485e 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"
@@ -543,7 +543,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 +627,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,
+ unsigned int flags);
+void initialize_repository_version(int hash_algo);
void sanitize_stdfds(void);
int daemonize(void);
@@ -1086,8 +1088,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
@@ -1314,8 +1318,6 @@
int is_directory(const char *);
char *strbuf_realpath(struct strbuf *resolved, const char *path,
int die_on_error);
-const char *real_path(const char *path);
-const char *real_path_if_valid(const char *path);
char *real_pathdup(const char *path, int die_on_error);
const char *absolute_path(const char *path);
char *absolute_pathdup(const char *path);
@@ -1481,6 +1483,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 +1521,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
@@ -1679,6 +1698,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,
diff --git a/ci/config/allow-refs.sample b/ci/config/allow-refs.sample
new file mode 100755
index 0000000..f157f19
--- /dev/null
+++ b/ci/config/allow-refs.sample
@@ -0,0 +1,26 @@
+#!/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-refs.sample allow-refs
+# $EDITOR allow-refs
+# 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/git-problem-matcher.json b/ci/git-problem-matcher.json
new file mode 100644
index 0000000..506dfbd
--- /dev/null
+++ b/ci/git-problem-matcher.json
@@ -0,0 +1,16 @@
+{
+ "problemMatcher": [
+ {
+ "owner": "git-test-suite",
+ "pattern": [
+ {
+ "regexp": "^([^ :]+\\.sh):(\\d+): (error|warning|info):\\s+(.*)$",
+ "file": 1,
+ "line": 2,
+ "severity": 3,
+ "message": 4
+ }
+ ]
+ }
+ ]
+}
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 497fd32..0229a77 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
@@ -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-4.8|GETTEXT_POISON)
+ 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..dac3688 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,32 @@
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}"
+
+ 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"
+
+ # https://github.com/actions/toolkit/blob/master/docs/commands.md#problem-matchers
+ echo "::add-matcher::ci/git-problem-matcher.json"
+ test linux-musl = "$jobname" ||
+ MAKEFLAGS="$MAKEFLAGS TEST_SHELL_PATH=/bin/sh"
else
echo "Could not identify CI type" >&2
+ env >&2
exit 1
fi
@@ -162,6 +189,9 @@
if [ "$jobname" = linux-gcc ]
then
export CC=gcc-8
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
+ else
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
fi
export GIT_TEST_HTTPD=true
@@ -182,6 +212,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,9 +222,17 @@
# Travis CI OS X
export GIT_SKIP_TESTS="t9810 t9816"
;;
-GIT_TEST_GETTEXT_POISON)
+GETTEXT_POISON)
export GIT_TEST_GETTEXT_POISON=true
;;
+Linux32)
+ CC=gcc
+ ;;
+linux-musl)
+ CC=gcc
+ MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3 USE_LIBPCRE2=Yes"
+ MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes"
+ ;;
esac
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index e688a26..92a983a 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 "::set-env name=FAILED_TEST_ARTIFACTS::t/failed-test-artifacts"
+ cp "${TEST_EXIT%.exit}.out" failed-test-artifacts/
+ tar czf failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir"
+ continue
+ ;;
*)
echo "Unhandled CI type: $CI_TYPE" >&2
exit 1
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 4df54c4..17e25aa 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -19,6 +19,7 @@
export GIT_TEST_OE_SIZE=10
export GIT_TEST_OE_DELTA_SIZE=5
export GIT_TEST_COMMIT_GRAPH=1
+ export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
export GIT_TEST_MULTI_PACK_INDEX=1
export GIT_TEST_ADD_I_USE_BUILTIN=1
make test
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/combine-diff.c b/combine-diff.c
index d5c4d83..002e0e5 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,
diff --git a/command-list.txt b/command-list.txt
index 2087894..185e5e3 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
diff --git a/commit-graph.c b/commit-graph.c
index f013a84..e3420dd 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -16,13 +16,33 @@
#include "hashmap.h"
#include "replace-object.h"
#include "progress.h"
+#include "bloom.h"
+#include "commit-slab.h"
+#include "shallow.h"
+
+void git_test_write_commit_graph_or_die(void)
+{
+ int flags = 0;
+ if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0))
+ return;
+
+ if (git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
+ flags = COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
+
+ if (write_commit_graph_reachable(the_repository->objects->odb,
+ flags, NULL))
+ die("failed to write commit-graph under GIT_TEST_COMMIT_GRAPH");
+}
#define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */
#define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
#define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
#define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
#define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
+#define GRAPH_CHUNKID_BLOOMINDEXES 0x42494458 /* "BIDX" */
+#define GRAPH_CHUNKID_BLOOMDATA 0x42444154 /* "BDAT" */
#define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */
+#define MAX_NUM_CHUNKS 7
#define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
@@ -44,9 +64,51 @@
/* Remember to update object flag allocation in object.h */
#define REACHABLE (1u<<15)
-char *get_commit_graph_filename(struct object_directory *odb)
+/* 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);
+}
+
+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;
+
+ /* lower generation commits first */
+ if (a->generation < b->generation)
+ return -1;
+ else if (a->generation > b->generation)
+ 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,
@@ -69,7 +131,6 @@
static struct commit_graph *alloc_commit_graph(void)
{
struct commit_graph *g = xcalloc(1, sizeof(*g));
- g->graph_fd = -1;
return g;
}
@@ -123,14 +184,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(graph_map, graph_size);
if (ret)
ret->odb = odb;
- else {
+ else
munmap(graph_map, graph_size);
- close(fd);
- }
return ret;
}
@@ -165,8 +225,7 @@
return 0;
}
-struct commit_graph *parse_commit_graph(void *graph_map, int fd,
- size_t graph_size)
+struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size)
{
const unsigned char *data, *chunk_lookup;
uint32_t i;
@@ -209,7 +268,6 @@
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;
@@ -224,8 +282,7 @@
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;
+ goto free_and_return;
}
chunk_id = get_be32(chunk_lookup + 0);
@@ -236,8 +293,7 @@
if (chunk_offset > graph_size - the_hash_algo->rawsz) {
error(_("commit-graph improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32),
(uint32_t)chunk_offset);
- free(graph);
- return NULL;
+ goto free_and_return;
}
switch (chunk_id) {
@@ -274,12 +330,37 @@
chunk_repeated = 1;
else
graph->chunk_base_graphs = data + chunk_offset;
+ break;
+
+ case GRAPH_CHUNKID_BLOOMINDEXES:
+ if (graph->chunk_bloom_indexes)
+ chunk_repeated = 1;
+ else
+ graph->chunk_bloom_indexes = data + chunk_offset;
+ break;
+
+ case GRAPH_CHUNKID_BLOOMDATA:
+ if (graph->chunk_bloom_data)
+ chunk_repeated = 1;
+ else {
+ uint32_t hash_version;
+ graph->chunk_bloom_data = data + chunk_offset;
+ hash_version = get_be32(data + chunk_offset);
+
+ if (hash_version != 1)
+ break;
+
+ graph->bloom_filter_settings = xmalloc(sizeof(struct bloom_filter_settings));
+ graph->bloom_filter_settings->hash_version = hash_version;
+ graph->bloom_filter_settings->num_hashes = get_be32(data + chunk_offset + 4);
+ graph->bloom_filter_settings->bits_per_entry = get_be32(data + chunk_offset + 8);
+ }
+ break;
}
if (chunk_repeated) {
error(_("commit-graph chunk id %08x appears multiple times"), chunk_id);
- free(graph);
- return NULL;
+ goto free_and_return;
}
if (last_chunk_id == GRAPH_CHUNKID_OIDLOOKUP)
@@ -292,14 +373,26 @@
last_chunk_offset = chunk_offset;
}
- hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);
-
- if (verify_commit_graph_lite(graph)) {
- free(graph);
- return NULL;
+ 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;
+
return graph;
+
+free_and_return:
+ free(graph->bloom_filter_settings);
+ free(graph);
+ return NULL;
}
static struct commit_graph *load_commit_graph_one(const char *graph_file,
@@ -788,9 +881,12 @@
unsigned append:1,
report_progress:1,
split:1,
- check_oids:1;
+ check_oids:1,
+ changed_paths:1,
+ order_by_pack:1;
const struct split_commit_graph_opts *split_opts;
+ size_t total_bloom_filter_data_size;
};
static void write_graph_chunk_fanout(struct hashfile *f,
@@ -866,7 +962,7 @@
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,
@@ -897,7 +993,7 @@
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,
@@ -964,7 +1060,7 @@
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,
@@ -986,6 +1082,59 @@
}
}
+static void write_graph_chunk_bloom_indexes(struct hashfile *f,
+ struct write_commit_graph_context *ctx)
+{
+ struct commit **list = ctx->commits.list;
+ struct commit **last = ctx->commits.list + ctx->commits.nr;
+ uint32_t cur_pos = 0;
+ struct progress *progress = NULL;
+ int i = 0;
+
+ if (ctx->report_progress)
+ progress = start_delayed_progress(
+ _("Writing changed paths Bloom filters index"),
+ ctx->commits.nr);
+
+ while (list < last) {
+ struct bloom_filter *filter = get_bloom_filter(ctx->r, *list, 0);
+ cur_pos += filter->len;
+ display_progress(progress, ++i);
+ hashwrite_be32(f, cur_pos);
+ list++;
+ }
+
+ stop_progress(&progress);
+}
+
+static void write_graph_chunk_bloom_data(struct hashfile *f,
+ struct write_commit_graph_context *ctx,
+ const struct bloom_filter_settings *settings)
+{
+ struct commit **list = ctx->commits.list;
+ struct commit **last = ctx->commits.list + ctx->commits.nr;
+ struct progress *progress = NULL;
+ int i = 0;
+
+ if (ctx->report_progress)
+ progress = start_delayed_progress(
+ _("Writing changed paths Bloom filters data"),
+ ctx->commits.nr);
+
+ hashwrite_be32(f, settings->hash_version);
+ hashwrite_be32(f, settings->num_hashes);
+ hashwrite_be32(f, settings->bits_per_entry);
+
+ while (list < last) {
+ struct bloom_filter *filter = get_bloom_filter(ctx->r, *list, 0);
+ display_progress(progress, ++i);
+ hashwrite(f, filter->data, filter->len * sizeof(unsigned char));
+ list++;
+ }
+
+ stop_progress(&progress);
+}
+
static int oid_compare(const void *_a, const void *_b)
{
const struct object_id *a = (const struct object_id *)_a;
@@ -1017,6 +1166,8 @@
oidcpy(&(ctx->oids.list[ctx->oids.nr]), oid);
ctx->oids.nr++;
+ set_commit_pos(ctx->r, oid);
+
return 0;
}
@@ -1037,6 +1188,8 @@
{
int i;
struct commit *commit;
+ enum commit_graph_split_flags flags = ctx->split_opts ?
+ ctx->split_opts->flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED;
if (ctx->report_progress)
ctx->progress = start_delayed_progress(
@@ -1066,8 +1219,9 @@
if (!commit)
continue;
if (ctx->split) {
- if (!parse_commit(commit) &&
- commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
+ if ((!parse_commit(commit) &&
+ commit->graph_pos == COMMIT_NOT_FROM_GRAPH) ||
+ flags == COMMIT_GRAPH_SPLIT_REPLACE)
add_missing_parents(ctx, commit);
} else if (!parse_commit_no_graph(commit))
add_missing_parents(ctx, commit);
@@ -1133,13 +1287,45 @@
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 compute_bloom_filters(struct write_commit_graph_context *ctx)
{
- struct string_list *list = (struct string_list *)cb_data;
+ int i;
+ struct progress *progress = NULL;
+ struct commit **sorted_commits;
- string_list_append(list, oid_to_hex(oid));
+ 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);
+
+ for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = sorted_commits[i];
+ struct bloom_filter *filter = get_bloom_filter(ctx->r, c, 1);
+ ctx->total_bloom_filter_data_size += sizeof(unsigned char) * filter->len;
+ display_progress(progress, i + 1);
+ }
+
+ free(sorted_commits);
+ stop_progress(&progress);
+}
+
+static int add_ref_to_set(const char *refname,
+ const struct object_id *oid,
+ int flags, void *cb_data)
+{
+ struct oidset *commits = (struct oidset *)cb_data;
+
+ oidset_insert(commits, oid);
return 0;
}
@@ -1147,14 +1333,14 @@
enum commit_graph_write_flags flags,
const struct split_commit_graph_opts *split_opts)
{
- struct string_list list = STRING_LIST_INIT_DUP;
+ struct oidset commits = OIDSET_INIT;
int result;
- for_each_ref(add_ref_to_list, &list);
- result = write_commit_graph(odb, NULL, &list,
+ for_each_ref(add_ref_to_set, &commits);
+ result = write_commit_graph(odb, NULL, &commits,
flags, split_opts);
- string_list_clear(&list, 0);
+ oidset_clear(&commits);
return result;
}
@@ -1203,39 +1389,46 @@
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;
+ uint32_t i = 0;
struct strbuf progress_title = STRBUF_INIT;
+ struct oidset_iter iter;
+ struct object_id *oid;
+
+ if (!oidset_size(commits))
+ return 0;
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);
+ oidset_size(commits)),
+ oidset_size(commits));
ctx->progress = start_delayed_progress(
progress_title.buf,
- commit_hex->nr);
+ oidset_size(commits));
}
- for (i = 0; i < commit_hex->nr; i++) {
- const char *end;
- struct object_id oid;
+
+ oidset_iter_init(commits, &iter);
+ while ((oid = oidset_iter_next(&iter))) {
struct commit *result;
- display_progress(ctx->progress, i + 1);
- if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
- (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {
+ display_progress(ctx->progress, ++i);
+
+ result = lookup_commit_reference_gently(ctx->r, oid, 1);
+ if (result) {
ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
ctx->oids.nr++;
} else if (ctx->check_oids) {
error(_("invalid commit object id: %s"),
- commit_hex->items[i].string);
+ oid_to_hex(oid));
return -1;
}
}
+
stop_progress(&ctx->progress);
strbuf_release(&progress_title);
@@ -1287,6 +1480,8 @@
static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
{
uint32_t i;
+ enum commit_graph_split_flags flags = ctx->split_opts ?
+ ctx->split_opts->flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED;
ctx->num_extra_edges = 0;
if (ctx->report_progress)
@@ -1303,11 +1498,14 @@
ALLOC_GROW(ctx->commits.list, ctx->commits.nr + 1, ctx->commits.alloc);
ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.list[i]);
- if (ctx->split &&
+ if (ctx->split && flags != COMMIT_GRAPH_SPLIT_REPLACE &&
ctx->commits.list[ctx->commits.nr]->graph_pos != COMMIT_NOT_FROM_GRAPH)
continue;
- parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
+ if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE)
+ parse_commit(ctx->commits.list[ctx->commits.nr]);
+ else
+ parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents);
if (num_parents > 2)
@@ -1350,12 +1548,13 @@
int fd;
struct hashfile *f;
struct lock_file lk = LOCK_INIT;
- uint32_t chunk_ids[6];
- uint64_t chunk_offsets[6];
+ uint32_t chunk_ids[MAX_NUM_CHUNKS + 1];
+ uint64_t chunk_offsets[MAX_NUM_CHUNKS + 1];
const unsigned hashsz = the_hash_algo->rawsz;
struct strbuf progress_title = STRBUF_INIT;
int num_chunks = 3;
struct object_id file_hash;
+ const struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS;
if (ctx->split) {
struct strbuf tmp_file = STRBUF_INIT;
@@ -1378,17 +1577,25 @@
if (ctx->split) {
char *lock_name = get_chain_filename(ctx->odb);
- hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR);
+ hold_lock_file_for_update_mode(&lk, lock_name,
+ LOCK_DIE_ON_ERROR, 0444);
fd = git_mkstemp_mode(ctx->graph_name, 0444);
if (fd < 0) {
- error(_("unable to create '%s'"), ctx->graph_name);
+ error(_("unable to create temporary graph layer"));
+ return -1;
+ }
+
+ if (adjust_shared_perm(ctx->graph_name)) {
+ error(_("unable to adjust shared permissions for '%s'"),
+ ctx->graph_name);
return -1;
}
f = hashfd(fd, ctx->graph_name);
} else {
- hold_lock_file_for_update(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR);
+ hold_lock_file_for_update_mode(&lk, ctx->graph_name,
+ LOCK_DIE_ON_ERROR, 0444);
fd = lk.tempfile->fd;
f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
}
@@ -1400,6 +1607,12 @@
chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES;
num_chunks++;
}
+ if (ctx->changed_paths) {
+ chunk_ids[num_chunks] = GRAPH_CHUNKID_BLOOMINDEXES;
+ num_chunks++;
+ chunk_ids[num_chunks] = GRAPH_CHUNKID_BLOOMDATA;
+ num_chunks++;
+ }
if (ctx->num_commit_graphs_after > 1) {
chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE;
num_chunks++;
@@ -1418,6 +1631,15 @@
4 * ctx->num_extra_edges;
num_chunks++;
}
+ if (ctx->changed_paths) {
+ chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
+ sizeof(uint32_t) * ctx->commits.nr;
+ num_chunks++;
+
+ chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
+ sizeof(uint32_t) * 3 + ctx->total_bloom_filter_data_size;
+ num_chunks++;
+ }
if (ctx->num_commit_graphs_after > 1) {
chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
hashsz * (ctx->num_commit_graphs_after - 1);
@@ -1455,6 +1677,10 @@
write_graph_chunk_data(f, hashsz, ctx);
if (ctx->num_extra_edges)
write_graph_chunk_extra_edges(f, ctx);
+ if (ctx->changed_paths) {
+ write_graph_chunk_bloom_indexes(f, ctx);
+ write_graph_chunk_bloom_data(f, ctx, &bloom_settings);
+ }
if (ctx->num_commit_graphs_after > 1 &&
write_graph_chunk_base(f, ctx)) {
return -1;
@@ -1488,8 +1714,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);
@@ -1529,6 +1759,7 @@
{
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;
@@ -1539,24 +1770,36 @@
if (ctx->split_opts->size_multiple)
size_mult = ctx->split_opts->size_multiple;
+
+ flags = ctx->split_opts->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 +1813,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++)
@@ -1707,7 +1950,7 @@
timestamp_t expire_time = time(NULL);
if (ctx->split_opts && ctx->split_opts->expire_time)
- expire_time -= ctx->split_opts->expire_time;
+ expire_time = ctx->split_opts->expire_time;
if (!ctx->split) {
char *chain_file_name = get_chain_filename(ctx->odb);
unlink(chain_file_name);
@@ -1756,13 +1999,14 @@
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)
{
struct write_commit_graph_context *ctx;
uint32_t i, count_distinct = 0;
int res = 0;
+ int replace = 0;
if (!commit_graph_compatible(the_repository))
return 0;
@@ -1775,6 +2019,8 @@
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->changed_paths = flags & COMMIT_GRAPH_WRITE_BLOOM_FILTERS ? 1 : 0;
+ ctx->total_bloom_filter_data_size = 0;
if (ctx->split) {
struct commit_graph *g;
@@ -1797,6 +2043,9 @@
g = g->base_graph;
}
}
+
+ if (ctx->split_opts)
+ replace = ctx->split_opts->flags & COMMIT_GRAPH_SPLIT_REPLACE;
}
ctx->approx_nr_objects = approximate_object_count();
@@ -1824,17 +2073,20 @@
}
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);
@@ -1857,18 +2109,22 @@
goto cleanup;
}
- if (!ctx->commits.nr)
+ if (!ctx->commits.nr && !replace)
goto cleanup;
if (ctx->split) {
split_graph_merge_strategy(ctx);
- merge_commit_graphs(ctx);
+ if (!replace)
+ merge_commit_graphs(ctx);
} else
ctx->num_commit_graphs_after = 1;
compute_generation_numbers(ctx);
+ if (ctx->changed_paths)
+ compute_bloom_filters(ctx);
+
res = write_commit_graph_file(ctx);
if (ctx->split)
@@ -2088,12 +2344,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..4212766 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -6,11 +6,23 @@
#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_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;
char *get_commit_graph_filename(struct object_directory *odb);
int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
@@ -39,8 +51,6 @@
const struct commit *c);
struct commit_graph {
- int graph_fd;
-
const unsigned char *data;
size_t data_len;
@@ -59,14 +69,17 @@
const unsigned char *chunk_commit_data;
const unsigned char *chunk_extra_edges;
const unsigned char *chunk_base_graphs;
+ const unsigned char *chunk_bloom_indexes;
+ const unsigned char *chunk_bloom_data;
+
+ struct bloom_filter_settings *bloom_filter_settings;
};
struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
struct 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(void *graph_map, size_t graph_size);
/*
* Return 1 if and only if the repository has a commit-graph
@@ -79,13 +92,21 @@
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_CHECK_OIDS = (1 << 3),
+ COMMIT_GRAPH_WRITE_BLOOM_FILTERS = (1 << 4),
+};
+
+enum commit_graph_split_flags {
+ COMMIT_GRAPH_SPLIT_UNSPECIFIED = 0,
+ COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED = 1,
+ COMMIT_GRAPH_SPLIT_REPLACE = 2
};
struct split_commit_graph_opts {
int size_multiple;
int max_commits;
timestamp_t expire_time;
+ enum commit_graph_split_flags flags;
};
/*
@@ -99,7 +120,7 @@
const struct split_commit_graph_opts *split_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);
diff --git a/commit-slab.h b/commit-slab.h
index 69bf0c8..05b3f28 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);
diff --git a/commit.c b/commit.c
index a6cfa41..87686a7 100644
--- a/commit.c
+++ b/commit.c
@@ -20,6 +20,7 @@
#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 **);
@@ -110,7 +111,7 @@
return commit_graft_table[index]->oid.hash;
}
-static int commit_graft_pos(struct repository *r, const unsigned char *sha1)
+int commit_graft_pos(struct repository *r, const unsigned char *sha1)
{
return sha1_pos(sha1, r->parsed_objects->grafts,
r->parsed_objects->grafts_nr,
@@ -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;
@@ -927,12 +915,22 @@
struct commit_list *bases;
int i;
struct commit *ret = NULL;
+ char *full_refname;
+
+ switch (dwim_ref(refname, strlen(refname), &oid, &full_refname)) {
+ 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 +956,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)
{
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");
@@ -1010,6 +1017,8 @@
const char *buffer = get_commit_buffer(commit, &size);
int in_signature, saw_signature = -1;
const char *line, *tail;
+ const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)];
+ int gpg_sig_header_len = strlen(gpg_sig_header);
line = buffer;
tail = buffer + size;
@@ -1056,11 +1065,17 @@
if (in_signature && line[0] == ' ')
sig_end = next;
- else if (starts_with(line, gpg_sig_header) &&
- line[gpg_sig_header_len] == ' ') {
- sig_start = line;
- sig_end = next;
- in_signature = 1;
+ else if (starts_with(line, "gpgsig")) {
+ int i;
+ for (i = 1; i < GIT_HASH_NALGOS; i++) {
+ const char *p;
+ if (skip_prefix(line, gpg_sig_headers[i], &p) &&
+ *p == ' ') {
+ sig_start = line;
+ sig_end = next;
+ in_signature = 1;
+ }
+ }
} else {
if (*line == '\n')
/* dump the whole remainder of the buffer */
diff --git a/commit.h b/commit.h
index 008a0fa..1b2dea5 100644
--- a/commit.h
+++ b/commit.h
@@ -236,6 +236,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 unsigned char *sha1);
int register_commit_graft(struct repository *r, struct commit_graft *, int);
void prepare_commit_graft(struct repository *r);
struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
@@ -247,53 +249,7 @@
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 run_add_interactive(const char *revision, const char *patch_mode,
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/mingw.c b/compat/mingw.c
index d14065d..8ee0b64 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -460,8 +460,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 +977,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 +1501,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 +1585,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 +2629,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/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/vcbuild/README b/compat/vcbuild/README
index 1b6dabf..42292e7 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -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/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..8db9c77 100644
--- a/config.c
+++ b/config.c
@@ -37,6 +37,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 +310,7 @@
{
struct config_include_data *inc = data;
const char *cond, *key;
- int cond_len;
+ size_t cond_len;
int ret;
/*
@@ -358,12 +359,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 +427,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);
}
@@ -523,6 +525,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 +743,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;
@@ -1539,6 +1554,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;
@@ -2383,7 +2399,7 @@
*/
struct config_store_data {
- int baselen;
+ size_t baselen;
char *key;
int do_not_match;
regex_t *value_regex;
@@ -2509,7 +2525,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 +2538,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 +2563,6 @@
{
int i;
ssize_t ret;
- int length = strlen(key + store->baselen + 1);
const char *quote = "";
struct strbuf sb = STRBUF_INIT;
@@ -2564,8 +2581,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]) {
@@ -3238,7 +3254,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..0608744 100644
--- a/config.h
+++ b/config.h
@@ -254,7 +254,7 @@
*/
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);
@@ -359,7 +359,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);
/**
diff --git a/config.mak.dev b/config.mak.dev
index 89b218d..cd4a82a 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -16,6 +16,8 @@
DEVELOPER_CFLAGS += -Wunused
DEVELOPER_CFLAGS += -Wvla
+DEVELOPER_CFLAGS += -DENABLE_SHA256
+
ifndef COMPILER_FEATURES
COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
endif
diff --git a/config.mak.uname b/config.mak.uname
index 0ab8e00..5ad43c8 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -133,8 +133,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
@@ -308,6 +317,7 @@
NO_STRLCPY = YesPlease
HAVE_PATHS_H = YesPlease
LIBC_CONTAINS_LIBINTL = YesPlease
+ FREAD_READS_DIRECTORIES = UnfortunatelyYes
endif
ifeq ($(uname_S),IRIX)
NO_SETENV = YesPlease
@@ -721,9 +731,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/connect.c b/connect.c
index b6451ab..23013c6 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"
diff --git a/connected.c b/connected.c
index 7e9bd1b..3135b71 100644
--- a/connected.c
+++ b/connected.c
@@ -52,7 +52,7 @@
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 +61,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,13 +75,18 @@
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);
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/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c21786f..70ad04e 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -504,7 +504,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
}
@@ -1860,6 +1860,7 @@
$merge
$__git_diff_common_options
--pickaxe-all --pickaxe-regex
+ --patch --no-patch
"
return
;;
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index eef4eff..ce47e86 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -150,9 +150,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
}
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/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/convert.c b/convert.c
index 5ead3ce..5724498 100644
--- a/convert.c
+++ b/convert.c
@@ -797,6 +797,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 +856,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 +990,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 +1010,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 +1018,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;
/*
@@ -1368,7 +1388,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 +1426,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 +1461,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 +1472,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 +1506,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 +1516,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 +2006,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-store.c b/credential-store.c
index c010497..294e771 100644
--- a/credential-store.c
+++ b/credential-store.c
@@ -24,8 +24,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) {
diff --git a/credential.c b/credential.c
index 77dfde4..d8d226b 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,12 +86,33 @@
return 0;
}
+static int match_partial_url(const char *url, void *cb)
+{
+ struct credential *c = cb;
+ struct credential want = CREDENTIAL_INIT;
+ int matches = 0;
+
+ if (credential_from_potentially_partial_url(&want, url) < 0)
+ warning(_("skipping credential lookup for key: credential.%s"),
+ url);
+ else
+ matches = credential_match(&want, c);
+ credential_clear(&want);
+
+ return matches;
+}
+
static void credential_apply_config(struct credential *c)
{
char *normalized_url;
struct urlmatch_config config = { STRING_LIST_INIT_DUP };
struct strbuf url = STRBUF_INIT;
+ if (!c->host)
+ die(_("refusing to work with credential missing host field"));
+ if (!c->protocol)
+ die(_("refusing to work with credential missing protocol field"));
+
if (c->configured)
return;
@@ -96,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);
@@ -131,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);
}
}
@@ -222,20 +248,25 @@
return 0;
}
-static void credential_write_item(FILE *fp, const char *key, const char *value)
+static void credential_write_item(FILE *fp, const char *key, const char *value,
+ int required)
{
+ if (!value && required)
+ BUG("credential value for %s is missing", key);
if (!value)
return;
+ if (strchr(value, '\n'))
+ die("credential value for %s contains newline", key);
fprintf(fp, "%s=%s\n", key, value);
}
void credential_write(const struct credential *c, FILE *fp)
{
- credential_write_item(fp, "protocol", c->protocol);
- credential_write_item(fp, "host", c->host);
- credential_write_item(fp, "path", c->path);
- credential_write_item(fp, "username", c->username);
- credential_write_item(fp, "password", c->password);
+ credential_write_item(fp, "protocol", c->protocol, 1);
+ credential_write_item(fp, "host", c->host, 1);
+ credential_write_item(fp, "path", c->path, 0);
+ credential_write_item(fp, "username", c->username, 0);
+ credential_write_item(fp, "password", c->password, 0);
}
static int run_credential_helper(struct credential *c,
@@ -353,7 +384,45 @@
c->approved = 0;
}
-void credential_from_url(struct credential *c, const char *url)
+static int check_url_component(const char *url, int quiet,
+ const char *name, const char *value)
+{
+ if (!value)
+ return 0;
+ if (!strchr(value, '\n'))
+ return 0;
+
+ if (!quiet)
+ warning(_("url contains a newline in its %s component: %s"),
+ name, url);
+ return -1;
+}
+
+/*
+ * Potentially-partial URLs can, but do not have to, contain
+ *
+ * - a protocol (or scheme) of the form "<protocol>://"
+ *
+ * - a host name (the part after the protocol and before the first slash after
+ * that, if any)
+ *
+ * - a user name and potentially a password (as "<user>[:<password>]@" part of
+ * the host name)
+ *
+ * - a path (the part after the host name, if any, starting with the slash)
+ *
+ * Missing parts will be left unset in `struct credential`. Thus, `https://`
+ * will have only the `protocol` set, `example.com` only the host name, and
+ * `/git` only the path.
+ *
+ * Note that an empty host name in an otherwise fully-qualified URL (e.g.
+ * `cert:///path/to/cert.pem`) will be treated as unset if we expect the URL to
+ * be potentially partial, and only then (otherwise, the empty string is used).
+ *
+ * The credential_from_url() function does not allow partial URLs.
+ */
+static int credential_from_url_1(struct credential *c, const char *url,
+ int allow_partial_url, int quiet)
{
const char *at, *colon, *cp, *slash, *host, *proto_end;
@@ -366,12 +435,22 @@
* (3) proto://<user>:<pass>@<host>/...
*/
proto_end = strstr(url, "://");
- if (!proto_end)
- return;
- cp = proto_end + 3;
+ if (!allow_partial_url && (!proto_end || proto_end == url)) {
+ if (!quiet)
+ warning(_("url has no scheme: %s"), url);
+ return -1;
+ }
+ cp = proto_end ? proto_end + 3 : url;
at = strchr(cp, '@');
colon = strchr(cp, ':');
- slash = strchrnul(cp, '/');
+
+ /*
+ * A query or fragment marker before the slash ends the host portion.
+ * We'll just continue to call this "slash" for simplicity. Notably our
+ * "trim leading slashes" part won't skip over this part of the path,
+ * but that's what we'd want.
+ */
+ slash = cp + strcspn(cp, "/?#");
if (!at || slash <= at) {
/* Case (1) */
@@ -392,9 +471,9 @@
host = at + 1;
}
- if (proto_end - url > 0)
+ if (proto_end && proto_end - url > 0)
c->protocol = xmemdupz(url, proto_end - url);
- if (slash - host > 0)
+ if (!allow_partial_url || slash - host > 0)
c->host = url_decode_mem(host, slash - host);
/* Trim leading and trailing slashes from path */
while (*slash == '/')
@@ -406,4 +485,30 @@
while (p > c->path && *p == '/')
*p-- = '\0';
}
+
+ if (check_url_component(url, quiet, "username", c->username) < 0 ||
+ check_url_component(url, quiet, "password", c->password) < 0 ||
+ check_url_component(url, quiet, "protocol", c->protocol) < 0 ||
+ check_url_component(url, quiet, "host", c->host) < 0 ||
+ check_url_component(url, quiet, "path", c->path) < 0)
+ return -1;
+
+ return 0;
+}
+
+static int credential_from_potentially_partial_url(struct credential *c,
+ const char *url)
+{
+ return credential_from_url_1(c, url, 1, 0);
+}
+
+int credential_from_url_gently(struct credential *c, const char *url, int quiet)
+{
+ return credential_from_url_1(c, url, 0, quiet);
+}
+
+void credential_from_url(struct credential *c, const char *url)
+{
+ if (credential_from_url_gently(c, url, 0) < 0)
+ die(_("credential url cannot be parsed: %s"), url);
}
diff --git a/credential.h b/credential.h
index fec7815..c0e17e3 100644
--- a/credential.h
+++ b/credential.h
@@ -173,10 +173,23 @@
int credential_read(struct credential *, FILE *);
void credential_write(const struct credential *, FILE *);
-/* Parse a URL into broken-down credential fields. */
+/*
+ * Parse a url into a credential struct, replacing any existing contents.
+ *
+ * If the url can't be parsed (e.g., a missing "proto://" component), the
+ * resulting credential will be empty and the function will return an
+ * error (even in the "gently" form).
+ *
+ * If we encounter a component which cannot be represented as a credential
+ * value (e.g., because it contains a newline), the "gently" form will return
+ * an error but leave the broken state in the credential object for further
+ * examination. The non-gentle form will issue a warning to stderr and return
+ * an empty credential.
+ */
void credential_from_url(struct credential *, const char *url);
+int credential_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/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/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.c b/diff.c
index f2cfbf2..d1ad6a3 100644
--- a/diff.c
+++ b/diff.c
@@ -573,7 +573,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 +585,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;
}
@@ -3020,6 +3024,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 +3054,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);
@@ -3339,13 +3346,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);
@@ -3677,8 +3688,8 @@
}
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);
}
@@ -3914,9 +3925,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 +3998,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 +4023,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 +4054,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;
@@ -4062,6 +4095,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 +4107,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 +4177,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,
@@ -6407,9 +6443,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 +6453,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 +6481,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 +6533,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 +6544,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)
@@ -6771,7 +6831,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..9443dc1 100644
--- a/diff.h
+++ b/diff.h
@@ -285,6 +285,11 @@
/* Number of hexdigits to abbreviate raw format output to. */
int abbrev;
+ /* If non-zero, then stop computing after this many changes. */
+ int max_changes;
+ /* For internal use only. */
+ int num_changes;
+
int ita_invisible_in_index;
/* white-space error highlighting */
#define WSEH_NEW (1<<12)
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..99e63e9 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -1,4 +1,5 @@
/*
+ *
* Copyright (C) 2005 Junio C Hamano
*/
#include "cache.h"
@@ -7,6 +8,7 @@
#include "object-store.h"
#include "hashmap.h"
#include "progress.h"
+#include "promisor-remote.h"
/* Table of rename/copy destinations */
@@ -128,10 +130,46 @@
short name_score;
};
+struct prefetch_options {
+ struct repository *repo;
+ int skip_unmodified;
+};
+static void prefetch(void *prefetch_options)
+{
+ struct prefetch_options *options = prefetch_options;
+ int i;
+ struct oid_array to_fetch = OID_ARRAY_INIT;
+
+ for (i = 0; i < rename_dst_nr; i++) {
+ if (rename_dst[i].pair)
+ /*
+ * The loop in diffcore_rename() will not need these
+ * blobs, so skip prefetching.
+ */
+ continue; /* already found exact match */
+ diff_add_if_missing(options->repo, &to_fetch,
+ rename_dst[i].two);
+ }
+ for (i = 0; i < rename_src_nr; i++) {
+ if (options->skip_unmodified &&
+ diff_unmodified_pair(rename_src[i].p))
+ /*
+ * The loop in diffcore_rename() will not need these
+ * blobs, so skip prefetching.
+ */
+ continue;
+ diff_add_if_missing(options->repo, &to_fetch,
+ rename_src[i].p->one);
+ }
+ promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
+ oid_array_clear(&to_fetch);
+}
+
static int estimate_similarity(struct repository *r,
struct diff_filespec *src,
struct diff_filespec *dst,
- int minimum_score)
+ int minimum_score,
+ int skip_unmodified)
{
/* src points at a file that existed in the original tree (or
* optionally a file in the destination tree) and dst points
@@ -148,6 +186,15 @@
*/
unsigned long max_size, delta_size, base_size, src_copied, literal_added;
int score;
+ struct diff_populate_filespec_options dpf_options = {
+ .check_size_only = 1
+ };
+ struct prefetch_options prefetch_options = {r, skip_unmodified};
+
+ if (r == the_repository && has_promisor_remote()) {
+ dpf_options.missing_object_cb = prefetch;
+ dpf_options.missing_object_data = &prefetch_options;
+ }
/* We deal only with regular files. Symlink renames are handled
* only when they are exact matches --- in other words, no edits
@@ -166,10 +213,10 @@
* say whether the size is valid or not!)
*/
if (!src->cnt_data &&
- diff_populate_filespec(r, src, CHECK_SIZE_ONLY))
+ diff_populate_filespec(r, src, &dpf_options))
return 0;
if (!dst->cnt_data &&
- diff_populate_filespec(r, dst, CHECK_SIZE_ONLY))
+ diff_populate_filespec(r, dst, &dpf_options))
return 0;
max_size = ((src->size > dst->size) ? src->size : dst->size);
@@ -187,9 +234,11 @@
if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
return 0;
- if (!src->cnt_data && diff_populate_filespec(r, src, 0))
+ dpf_options.check_size_only = 0;
+
+ if (!src->cnt_data && diff_populate_filespec(r, src, &dpf_options))
return 0;
- if (!dst->cnt_data && diff_populate_filespec(r, dst, 0))
+ if (!dst->cnt_data && diff_populate_filespec(r, dst, &dpf_options))
return 0;
if (diffcore_count_changes(r, src, dst,
@@ -261,7 +310,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);
@@ -566,7 +615,8 @@
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;
diff --git a/diffcore.h b/diffcore.h
index 7c07347..d2a63c5 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 *);
@@ -182,4 +198,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..d97e955 100644
--- a/dir.c
+++ b/dir.c
@@ -1727,36 +1727,59 @@
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:
- 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));
+ /*
+ * 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 = do_match_pathspec(istate, pathspec, dirname, len,
+ 0 /* prefix */, NULL /* seen */,
+ DO_MATCH_LEADING_PATHSPEC);
+ if (!matches_how)
+ return path_none;
+ }
- 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_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 :
+ (excluded ? path_excluded : path_untracked));
+
+ if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) {
+ if (excluded &&
+ (dir->flags & DIR_SHOW_IGNORED_TOO) &&
+ (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) {
/*
* This is an excluded directory and we are
@@ -1783,18 +1806,134 @@
/* 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 directories 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;
+
+ /*
+ * If we have we don't want to know the all the paths under an
+ * untracked or ignored directory, we still need to go into the
+ * directory to determine if it is empty (because 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,85 +2073,6 @@
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,
@@ -2021,6 +2081,11 @@
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,6 +2119,8 @@
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,
baselen, pathspec);
@@ -2064,8 +2131,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 (excluded)
+ return path_excluded;
+ if (pathspec &&
+ !do_match_pathspec(istate, pathspec, path->buf, path->len,
+ 0 /* prefix */, NULL /* seen */,
+ 0 /* flags */))
+ return path_none;
+ return path_untracked;
+ }
}
static void add_untracked(struct untracked_cache_dir *dir, const char *name)
@@ -2245,7 +2376,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 +2389,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 +2414,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 +2462,7 @@
add_untracked(untracked, path.buf + baselen);
break;
}
- /* skip the dir_add_* part */
+ /* skip the add_path_to_appropriate_result_list() */
continue;
}
@@ -2377,15 +2498,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 +2548,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 */
@@ -2652,28 +2748,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;
diff --git a/editor.c b/editor.c
index f079abb..91989ee 100644
--- a/editor.c
+++ b/editor.c
@@ -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..00b4903 100644
--- a/entry.c
+++ b/entry.c
@@ -264,6 +264,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,
@@ -315,13 +318,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);
diff --git a/environment.c b/environment.c
index e72a02d..aaca0e9 100644
--- a/environment.c
+++ b/environment.c
@@ -17,6 +17,7 @@
#include "argv-array.h"
#include "object-store.h"
#include "chdir-notify.h"
+#include "shallow.h"
int trust_executable_bit = 1;
int trust_ctime = 1;
@@ -254,8 +255,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 +268,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 +351,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/fast-import.c b/fast-import.c
index b8b65a8..c989702 100644
--- a/fast-import.c
+++ b/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;
@@ -131,6 +149,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 +194,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 +243,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 +256,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 +307,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 +385,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 +471,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++) {
@@ -493,9 +533,8 @@
return r;
}
-static void insert_mark(uintmax_t idnum, struct object_entry *oe)
+static void insert_mark(struct mark_set *s, uintmax_t idnum, struct object_entry *oe)
{
- struct mark_set *s = marks;
while ((idnum >> s->shift) >= 1024) {
s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
s->shift = marks->shift + 10;
@@ -516,10 +555,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) {
@@ -919,7 +957,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 +1155,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 +1693,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 +1722,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 +1730,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 +1769,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;
@@ -2134,6 +2171,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 +2275,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 +2449,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 +2470,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 +2574,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 +2638,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);
@@ -2751,7 +2812,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 +2970,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 +2985,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 +3054,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 +3227,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)
@@ -3210,6 +3307,26 @@
pack_edges = xfopen(edges, "a");
}
+static void option_rewrite_submodules(const char *arg, struct string_list *list)
+{
+ struct mark_set *ms;
+ FILE *fp;
+ char *s = xstrdup(arg);
+ char *f = strchr(s, ':');
+ if (!f)
+ die(_("Expected format name:filename for submodule rewrite option"));
+ *f = '\0';
+ f++;
+ ms = xcalloc(1, sizeof(*ms));
+ string_list_insert(list, s)->util = ms;
+
+ fp = fopen(f, "r");
+ if (!fp)
+ die_errno("cannot read '%s'", f);
+ read_mark_file(ms, fp, insert_oid_entry);
+ fclose(fp);
+}
+
static int parse_one_option(const char *option)
{
if (skip_prefix(option, "max-pack-size=", &option)) {
@@ -3272,6 +3389,11 @@
option_export_marks(arg);
} else if (!strcmp(feature, "alias")) {
; /* Don't die - this feature is supported */
+ } else if (skip_prefix(feature, "rewrite-submodules-to=", &arg)) {
+ option_rewrite_submodules(arg, &sub_marks_to);
+ } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
+ option_rewrite_submodules(arg, &sub_marks_from);
+ } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
} else if (!strcmp(feature, "get-mark")) {
; /* Don't die - this feature is supported */
} else if (!strcmp(feature, "cat-blob")) {
@@ -3377,6 +3499,7 @@
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)
@@ -3397,6 +3520,8 @@
avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
+ hashmap_init(&object_table, object_entry_hashcmp, NULL, 0);
+
/*
* We don't parse most options until after we've seen the set of
* "feature" lines at the start of the stream (which allows the command
diff --git a/fetch-pack.c b/fetch-pack.c
index 1734a57..7eaa19d 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,7 +35,7 @@
static int transfer_fsck_objects = -1;
static int agent_supported;
static int server_supports_filtering;
-static struct lock_file shallow_lock;
+static struct shallow_lock shallow_lock;
static const char *alternate_shallow_file;
static struct strbuf fsck_msg_types = STRBUF_INIT;
@@ -1143,6 +1144,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 +1159,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,7 +1175,7 @@
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;
struct strbuf req_buf = STRBUF_INIT;
@@ -1230,7 +1232,8 @@
add_common(&req_buf, common);
/* Add initial haves */
- ret = add_haves(negotiator, &req_buf, haves_to_send, in_vain);
+ ret = add_haves(negotiator, seen_ack, &req_buf,
+ haves_to_send, in_vain);
}
/* Send request */
@@ -1268,9 +1271,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 +1308,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 +1343,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,
@@ -1444,6 +1468,7 @@
int haves_to_send = INITIAL_FLUSH;
struct fetch_negotiator negotiator_alloc;
struct fetch_negotiator *negotiator;
+ int seen_ack = 0;
if (args->no_dependents) {
negotiator = NULL;
@@ -1500,7 +1525,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 +1534,14 @@
case FETCH_PROCESS_ACKS:
/* Process ACKs/NAKs */
switch (process_acks(negotiator, &reader, &common)) {
- case 2:
+ case READY:
state = FETCH_GET_PACK;
break;
- case 1:
+ case COMMON_FOUND:
in_vain = 0;
+ seen_ack = 1;
/* fallthrough */
- default:
+ case NO_COMMON_FOUND:
state = FETCH_SEND_REQUEST;
break;
}
@@ -1629,9 +1656,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 +1682,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 +1720,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;
@@ -1785,7 +1812,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/fmt-merge-msg.c b/fmt-merge-msg.c
new file mode 100644
index 0000000..72d32bd
--- /dev/null
+++ b/fmt-merge-msg.c
@@ -0,0 +1,656 @@
+#include "config.h"
+#include "refs.h"
+#include "object-store.h"
+#include "diff.h"
+#include "revision.h"
+#include "tag.h"
+#include "string-list.h"
+#include "branch.h"
+#include "fmt-merge-msg.h"
+#include "commit-reach.h"
+
+static int use_branch_desc;
+
+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 signature_check sigc = { NULL };
+ struct strbuf sig = STRBUF_INIT;
+
+ if (!buf || type != OBJ_TAG)
+ goto next;
+ len = parse_signature(buf, size);
+
+ if (size == len)
+ ; /* merely annotated */
+ else if (check_signature(buf, len, buf + len, size - len, &sigc) &&
+ !sigc.gpg_output)
+ strbuf_addstr(&sig, "gpg verification failed.\n");
+ else
+ strbuf_addstr(&sig, sigc.gpg_output);
+ signature_check_clear(&sigc);
+
+ if (!tag_number++) {
+ fmt_tag_signature(&tagbuf, &sig, buf, len);
+ first_tag = i;
+ } else {
+ if (tag_number == 2) {
+ struct strbuf tagline = STRBUF_INIT;
+ strbuf_addch(&tagline, '\n');
+ strbuf_add_commented_lines(&tagline,
+ origins.items[first_tag].string,
+ strlen(origins.items[first_tag].string));
+ strbuf_insert(&tagbuf, 0, tagline.buf,
+ tagline.len);
+ strbuf_release(&tagline);
+ }
+ strbuf_addch(&tagbuf, '\n');
+ strbuf_add_commented_lines(&tagbuf,
+ origins.items[i].string,
+ strlen(origins.items[i].string));
+ fmt_tag_signature(&tagbuf, &sig, buf, len);
+ }
+ strbuf_release(&sig);
+ next:
+ free(buf);
+ }
+ if (tagbuf.len) {
+ strbuf_addch(out, '\n');
+ strbuf_addbuf(out, &tagbuf);
+ }
+ strbuf_release(&tagbuf);
+}
+
+static void find_merge_parents(struct merge_parents *result,
+ struct strbuf *in, struct object_id *head)
+{
+ struct commit_list *parents;
+ struct commit *head_commit;
+ int pos = 0, i, j;
+
+ parents = NULL;
+ while (pos < in->len) {
+ int len;
+ char *p = in->buf + pos;
+ char *newline = strchr(p, '\n');
+ const char *q;
+ struct object_id oid;
+ struct commit *parent;
+ struct object *obj;
+
+ len = newline ? newline - p : strlen(p);
+ pos += len + !!newline;
+
+ if (parse_oid_hex(p, &oid, &q) ||
+ q[0] != '\t' ||
+ q[1] != '\t')
+ continue; /* skip not-for-merge */
+ /*
+ * Do not use get_merge_parent() here; we do not have
+ * "name" here and we do not want to contaminate its
+ * util field yet.
+ */
+ obj = parse_object(the_repository, &oid);
+ parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT);
+ if (!parent)
+ continue;
+ commit_list_insert(parent, &parents);
+ add_merge_parent(result, &obj->oid, &parent->object.oid);
+ }
+ head_commit = lookup_commit(the_repository, head);
+ if (head_commit)
+ commit_list_insert(head_commit, &parents);
+ reduce_heads_replace(&parents);
+
+ while (parents) {
+ struct commit *cmit = pop_commit(&parents);
+ for (i = 0; i < result->nr; i++)
+ if (oideq(&result->item[i].commit, &cmit->object.oid))
+ result->item[i].used = 1;
+ }
+
+ for (i = j = 0; i < result->nr; i++) {
+ if (result->item[i].used) {
+ if (i != j)
+ result->item[j] = result->item[i];
+ j++;
+ }
+ }
+ result->nr = j;
+}
+
+
+int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+ struct fmt_merge_msg_opts *opts)
+{
+ int i = 0, pos = 0;
+ struct object_id head_oid;
+ const char *current_branch;
+ void *current_branch_to_free;
+ struct merge_parents merge_parents;
+
+ memset(&merge_parents, 0, sizeof(merge_parents));
+
+ /* get current branch */
+ current_branch = current_branch_to_free =
+ resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL);
+ if (!current_branch)
+ die("No current branch");
+ if (starts_with(current_branch, "refs/heads/"))
+ current_branch += 11;
+
+ find_merge_parents(&merge_parents, in, &head_oid);
+
+ /* get a line */
+ while (pos < in->len) {
+ int len;
+ char *newline, *p = in->buf + pos;
+
+ newline = strchr(p, '\n');
+ len = newline ? newline - p : strlen(p);
+ pos += len + !!newline;
+ i++;
+ p[len] = 0;
+ if (handle_line(p, &merge_parents))
+ die("error in line %d: %.*s", i, len, p);
+ }
+
+ if (opts->add_title && srcs.nr)
+ fmt_merge_msg_title(out, current_branch);
+
+ if (origins.nr)
+ fmt_merge_msg_sigs(out);
+
+ if (opts->shortlog_len) {
+ struct commit *head;
+ struct rev_info rev;
+
+ head = lookup_commit_or_die(&head_oid, "HEAD");
+ repo_init_revisions(the_repository, &rev, NULL);
+ rev.commit_format = CMIT_FMT_ONELINE;
+ rev.ignore_merges = 1;
+ rev.limited = 1;
+
+ strbuf_complete_line(out);
+
+ for (i = 0; i < origins.nr; i++)
+ shortlog(origins.items[i].string,
+ origins.items[i].util,
+ head, &rev, opts, out);
+ }
+
+ strbuf_complete_line(out);
+ free(current_branch_to_free);
+ free(merge_parents.item);
+ return 0;
+}
diff --git a/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 640d813..8bb3ecf 100644
--- a/fsck.c
+++ b/fsck.c
@@ -9,12 +9,14 @@
#include "tag.h"
#include "fsck.h"
#include "refs.h"
+#include "url.h"
#include "utf8.h"
#include "decorate.h"
#include "oidset.h"
#include "packfile.h"
#include "submodule-config.h"
#include "config.h"
+#include "credential.h"
#include "help.h"
static struct oidset gitmodules_found = OIDSET_INIT;
@@ -521,6 +523,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
@@ -532,7 +556,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);
@@ -564,6 +595,41 @@
c1 = '/';
if (!c2 && S_ISDIR(mode2))
c2 = '/';
+
+ /*
+ * There can be non-consecutive duplicates due to the implicitly
+ * add 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))
+ break;
+ 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;
}
@@ -585,6 +651,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");
@@ -664,7 +731,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;
@@ -680,6 +748,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)
@@ -910,6 +980,149 @@
return ret;
}
+/*
+ * Like builtin/submodule--helper.c's starts_with_dot_slash, but without
+ * relying on the platform-dependent is_dir_sep helper.
+ *
+ * This is for use in checking whether a submodule URL is interpreted as
+ * relative to the current directory on any platform, since \ is a
+ * directory separator on Windows but not on other platforms.
+ */
+static int starts_with_dot_slash(const char *str)
+{
+ return str[0] == '.' && (str[1] == '/' || str[1] == '\\');
+}
+
+/*
+ * Like starts_with_dot_slash, this is a variant of submodule--helper's
+ * helper of the same name with the twist that it accepts backslash as a
+ * directory separator even on non-Windows platforms.
+ */
+static int starts_with_dot_dot_slash(const char *str)
+{
+ return str[0] == '.' && starts_with_dot_slash(str + 1);
+}
+
+static int submodule_url_is_relative(const char *url)
+{
+ return starts_with_dot_slash(url) || starts_with_dot_dot_slash(url);
+}
+
+/*
+ * Count directory components that a relative submodule URL should chop
+ * from the remote_url it is to be resolved against.
+ *
+ * In other words, this counts "../" components at the start of a
+ * submodule URL.
+ *
+ * Returns the number of directory components to chop and writes a
+ * pointer to the next character of url after all leading "./" and
+ * "../" components to out.
+ */
+static int count_leading_dotdots(const char *url, const char **out)
+{
+ int result = 0;
+ while (1) {
+ if (starts_with_dot_dot_slash(url)) {
+ result++;
+ url += strlen("../");
+ continue;
+ }
+ if (starts_with_dot_slash(url)) {
+ url += strlen("./");
+ continue;
+ }
+ *out = url;
+ return result;
+ }
+}
+/*
+ * Check whether a transport is implemented by git-remote-curl.
+ *
+ * If it is, returns 1 and writes the URL that would be passed to
+ * git-remote-curl to the "out" parameter.
+ *
+ * Otherwise, returns 0 and leaves "out" untouched.
+ *
+ * Examples:
+ * http::https://example.com/repo.git -> 1, https://example.com/repo.git
+ * https://example.com/repo.git -> 1, https://example.com/repo.git
+ * git://example.com/repo.git -> 0
+ *
+ * This is for use in checking for previously exploitable bugs that
+ * required a submodule URL to be passed to git-remote-curl.
+ */
+static int url_to_curl_url(const char *url, const char **out)
+{
+ /*
+ * We don't need to check for case-aliases, "http.exe", and so
+ * on because in the default configuration, is_transport_allowed
+ * prevents URLs with those schemes from being cloned
+ * automatically.
+ */
+ if (skip_prefix(url, "http::", out) ||
+ skip_prefix(url, "https::", out) ||
+ skip_prefix(url, "ftp::", out) ||
+ skip_prefix(url, "ftps::", out))
+ return 1;
+ if (starts_with(url, "http://") ||
+ starts_with(url, "https://") ||
+ starts_with(url, "ftp://") ||
+ starts_with(url, "ftps://")) {
+ *out = url;
+ return 1;
+ }
+ return 0;
+}
+
+static int check_submodule_url(const char *url)
+{
+ const char *curl_url;
+
+ if (looks_like_command_line_option(url))
+ return -1;
+
+ if (submodule_url_is_relative(url)) {
+ char *decoded;
+ const char *next;
+ int has_nl;
+
+ /*
+ * This could be appended to an http URL and url-decoded;
+ * check for malicious characters.
+ */
+ decoded = url_decode(url);
+ has_nl = !!strchr(decoded, '\n');
+
+ free(decoded);
+ if (has_nl)
+ return -1;
+
+ /*
+ * URLs which escape their root via "../" can overwrite
+ * the host field and previous components, resolving to
+ * URLs like https::example.com/submodule.git and
+ * https:///example.com/submodule.git that were
+ * susceptible to CVE-2020-11008.
+ */
+ if (count_leading_dotdots(url, &next) > 0 &&
+ (*next == ':' || *next == '/'))
+ return -1;
+ }
+
+ else if (url_to_curl_url(url, &curl_url)) {
+ struct credential c = CREDENTIAL_INIT;
+ int ret = 0;
+ if (credential_from_url_gently(&c, curl_url, 1) ||
+ !*c.host)
+ ret = -1;
+ credential_clear(&c);
+ return ret;
+ }
+
+ return 0;
+}
+
struct fsck_gitmodules_data {
const struct object_id *oid;
struct fsck_options *options;
@@ -920,7 +1133,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 ||
@@ -935,7 +1148,7 @@
"disallowed submodule name: %s",
name);
if (!strcmp(key, "url") && value &&
- looks_like_command_line_option(value))
+ check_submodule_url(value) < 0)
data->ret |= report(data->options,
data->oid, OBJ_BLOB,
FSCK_MSG_GITMODULES_URL,
diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c
index 0157acb..9fd1c04 100644
--- a/fuzz-commit-graph.c
+++ b/fuzz-commit-graph.c
@@ -1,8 +1,7 @@
#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(void *graph_map, size_t graph_size);
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
@@ -11,7 +10,7 @@
struct commit_graph *g;
initialize_the_repository();
- g = parse_commit_graph((void *)data, -1, size);
+ g = parse_commit_graph((void *)data, size);
repo_clear(the_repository);
free(g);
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 71158f7..45fecf8 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -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/git-bisect.sh b/git-bisect.sh
index efee12b..71b367a 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -209,6 +209,7 @@
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
+ oIFS="$IFS" IFS="$IFS$(printf '\015')"
while read git bisect command rev
do
test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
@@ -232,6 +233,7 @@
die "$(gettext "?? what are you talking about?")" ;;
esac
done <"$file"
+ IFS="$oIFS"
bisect_auto_next
}
diff --git a/git-compat-util.h b/git-compat-util.h
index aed0b5d..8ba576e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -389,6 +389,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
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-p4.py b/git-p4.py
index 9a71a66..d551efb 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
+ occured in P4. It takes no parameters and is meant primarily for notification
+ and cannot affect the outcome of the git p4 submit action.
+ """
self.usage += " [name of git branch to submit into perforce depot]"
self.origin = ""
@@ -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
@@ -2509,7 +2668,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 +2677,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 +2692,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 +2808,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 +2822,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 +2831,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 +2865,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 +2899,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 +2916,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 +2932,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 +2954,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 +2974,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 +2999,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 +3007,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,7 +3028,7 @@
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 ]
@@ -2874,12 +3038,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 +3142,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 +3214,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 +3258,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 +3837,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
@@ -4160,7 +4371,6 @@
"unshelve" : P4Unshelve,
}
-
def main():
if len(sys.argv[1:]) == 0:
printUsage(commands.keys())
diff --git a/git-submodule.sh b/git-submodule.sh
index 89f915c..39ebdf2 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -48,6 +48,8 @@
progress=
dissociate=
single_branch=
+jobs=
+recommend_shallow=
die_if_unmatched ()
{
@@ -803,27 +805,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} -- "$@"
}
#
diff --git a/git.c b/git.c
index 7be7ad3..a2d337e 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)
@@ -351,6 +352,7 @@
trace2_cmd_alias(alias_command, child.args.argv);
trace2_cmd_list_config();
+ trace2_cmd_list_env_vars();
trace2_cmd_name("_run_shell_alias_");
ret = run_command(&child);
@@ -388,6 +390,7 @@
trace2_cmd_alias(alias_command, new_argv);
trace2_cmd_list_config();
+ trace2_cmd_list_env_vars();
*argv = new_argv;
*argcp += count - 1;
@@ -439,6 +442,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);
@@ -574,12 +578,7 @@
{ "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 },
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..2d538bc 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -256,6 +256,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);
+
+ 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;
+}
+
int check_signature(const char *payload, size_t plen, const char *signature,
size_t slen, struct signature_check *sigc)
{
@@ -418,51 +467,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..f4e9b4f 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -54,15 +54,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..4cd9915 100644
--- a/graph.c
+++ b/graph.c
@@ -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/hash.h b/hash.h
index 52a4f1a..e0f3f16 100644
--- a/hash.h
+++ b/hash.h
@@ -16,6 +16,7 @@
#endif
#if defined(SHA256_GCRYPT)
+#define SHA256_NEEDS_CLONE_HELPER
#include "sha256/gcrypt.h"
#elif defined(SHA256_OPENSSL)
#include <openssl/sha.h>
@@ -54,12 +55,28 @@
#define git_SHA256_Update platform_SHA256_Update
#define git_SHA256_Final platform_SHA256_Final
+#ifdef platform_SHA256_Clone
+#define git_SHA256_Clone platform_SHA256_Clone
+#endif
+
#ifdef SHA1_MAX_BLOCK_SIZE
#include "compat/sha1-chunked.h"
#undef git_SHA1_Update
#define git_SHA1_Update git_SHA1_Update_Chunked
#endif
+static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src)
+{
+ memcpy(dst, src, sizeof(*dst));
+}
+
+#ifndef SHA256_NEEDS_CLONE_HELPER
+static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src)
+{
+ memcpy(dst, src, sizeof(*dst));
+}
+#endif
+
/*
* Note that these constants are suitable for indexing the hash_algos array and
* comparing against each other, but are otherwise arbitrary, so they should not
@@ -85,6 +102,7 @@
typedef union git_hash_ctx git_hash_ctx;
typedef void (*git_hash_init_fn)(git_hash_ctx *ctx);
+typedef void (*git_hash_clone_fn)(git_hash_ctx *dst, const git_hash_ctx *src);
typedef void (*git_hash_update_fn)(git_hash_ctx *ctx, const void *in, size_t len);
typedef void (*git_hash_final_fn)(unsigned char *hash, git_hash_ctx *ctx);
@@ -110,6 +128,9 @@
/* The hash initialization function. */
git_hash_init_fn init_fn;
+ /* The hash context cloning function. */
+ git_hash_clone_fn clone_fn;
+
/* The hash update function. */
git_hash_update_fn update_fn;
diff --git a/help.c b/help.c
index cf67624..1de9c0d 100644
--- a/help.c
+++ b/help.c
@@ -407,91 +407,6 @@
putchar('\n');
}
-struct slot_expansion {
- const char *prefix;
- const char *placeholder;
- void (*fn)(struct string_list *list, const char *prefix);
- int found;
-};
-
-void list_config_help(int for_human)
-{
- struct slot_expansion slot_expansions[] = {
- { "advice", "*", list_config_advices },
- { "color.branch", "<slot>", list_config_color_branch_slots },
- { "color.decorate", "<slot>", list_config_color_decorate_slots },
- { "color.diff", "<slot>", list_config_color_diff_slots },
- { "color.grep", "<slot>", list_config_color_grep_slots },
- { "color.interactive", "<slot>", list_config_color_interactive_slots },
- { "color.remote", "<slot>", list_config_color_sideband_slots },
- { "color.status", "<slot>", list_config_color_status_slots },
- { "fsck", "<msg-id>", list_config_fsck_msg_ids },
- { "receive.fsck", "<msg-id>", list_config_fsck_msg_ids },
- { NULL, NULL, NULL }
- };
- const char **p;
- struct slot_expansion *e;
- struct string_list keys = STRING_LIST_INIT_DUP;
- int i;
-
- for (p = config_name_list; *p; p++) {
- const char *var = *p;
- struct strbuf sb = STRBUF_INIT;
-
- for (e = slot_expansions; e->prefix; e++) {
-
- strbuf_reset(&sb);
- strbuf_addf(&sb, "%s.%s", e->prefix, e->placeholder);
- if (!strcasecmp(var, sb.buf)) {
- e->fn(&keys, e->prefix);
- e->found++;
- break;
- }
- }
- strbuf_release(&sb);
- if (!e->prefix)
- string_list_append(&keys, var);
- }
-
- for (e = slot_expansions; e->prefix; e++)
- if (!e->found)
- BUG("slot_expansion %s.%s is not used",
- e->prefix, e->placeholder);
-
- string_list_sort(&keys);
- for (i = 0; i < keys.nr; i++) {
- const char *var = keys.items[i].string;
- const char *wildcard, *tag, *cut;
-
- if (for_human) {
- puts(var);
- continue;
- }
-
- wildcard = strchr(var, '*');
- tag = strchr(var, '<');
-
- if (!wildcard && !tag) {
- puts(var);
- continue;
- }
-
- if (wildcard && !tag)
- cut = wildcard;
- else if (!wildcard && tag)
- cut = tag;
- else
- cut = wildcard < tag ? wildcard : tag;
-
- /*
- * We may produce duplicates, but that's up to
- * git-completion.bash to handle
- */
- printf("%.*s\n", (int)(cut - var), var);
- }
- string_list_clear(&keys, 0);
-}
-
static int get_alias(const char *var, const char *value, void *data)
{
struct string_list *list = data;
@@ -707,8 +622,32 @@
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));
+ /* 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 +661,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..500521b 100644
--- a/help.h
+++ b/help.h
@@ -22,7 +22,6 @@
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_all_main_cmds(struct string_list *list);
void list_all_other_cmds(struct string_list *list);
@@ -38,6 +37,7 @@
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.c b/http.c
index 00a0e50..62aa995 100644
--- a/http.c
+++ b/http.c
@@ -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)) {
@@ -558,6 +579,7 @@
return 0;
if (!cert_auth.password) {
cert_auth.protocol = xstrdup("cert");
+ cert_auth.host = xstrdup("");
cert_auth.username = xstrdup("");
cert_auth.path = xstrdup(ssl_cert);
credential_fill(&cert_auth);
@@ -565,6 +587,22 @@
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)
{
@@ -924,8 +962,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,
@@ -1018,9 +1062,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);
@@ -1160,6 +1213,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;
@@ -1230,6 +1290,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);
}
diff --git a/line-log.c b/line-log.c
index 9010e00..40e1738 100644
--- a/line-log.c
+++ b/line-log.c
@@ -519,7 +519,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);
@@ -1045,12 +1045,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 {
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index 2ffb392..73fffa4 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -82,9 +82,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..0a3ef3c 100644
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -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);
diff --git a/ll-merge.c b/ll-merge.c
index d65a897..1ec0b95 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);
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..55a68d0 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -81,6 +81,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 +138,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 +203,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;
@@ -449,22 +500,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)
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 +547,9 @@
struct object_id oid;
struct tag *tag;
struct strbuf verify_message;
+ struct signature_check sigc = { 0 };
int status, nth;
- size_t payload_size, gpg_message_offset;
+ size_t payload_size;
hash_object_file(the_hash_algo, extra->value, extra->len,
type_name(OBJ_TAG), &oid);
@@ -520,19 +571,19 @@
else
strbuf_addf(&verify_message,
"parent #%d, tagged '%s'\n", nth + 1, tag->tag);
- gpg_message_offset = verify_message.len;
payload_size = parse_signature(extra->value, extra->len);
status = -1;
if (extra->len > payload_size) {
/* could have a good signature */
- if (!verify_signed_buffer(extra->value, payload_size,
- extra->value + payload_size,
- extra->len - payload_size,
- &verify_message, NULL))
- status = 0; /* good */
- else if (verify_message.len <= gpg_message_offset)
+ status = check_signature(extra->value, payload_size,
+ extra->value + payload_size,
+ extra->len - payload_size, &sigc);
+ if (sigc.gpg_output)
+ strbuf_addstr(&verify_message, sigc.gpg_output);
+ else
strbuf_addstr(&verify_message, "No signature\n");
+ signature_check_clear(&sigc);
/* otherwise we couldn't verify, which is shown as bad */
}
@@ -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;
diff --git a/log-tree.h b/log-tree.h
index e668628..8fa7928 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);
diff --git a/ls-refs.c b/ls-refs.c
index 818aef7..50d8686 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -93,7 +93,7 @@
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;
@@ -105,6 +105,9 @@
argv_array_push(&data.prefixes, out);
}
+ if (request->status != PACKET_READ_FLUSH)
+ die(_("expected flush after ls-refs arguments"));
+
head_ref_namespaced(send_ref, &data);
for_each_namespaced_ref(send_ref, &data);
packet_flush(1);
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/merge-recursive.c b/merge-recursive.c
index 7a4e6f2..d92e2ac 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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);
diff --git a/merge.c b/merge.c
index 7c1d756..aa36de2 100644
--- a/merge.c
+++ b/merge.c
@@ -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)) {
diff --git a/midx.c b/midx.c
index 1527e46..6d1584c 100644
--- a/midx.c
+++ b/midx.c
@@ -72,9 +72,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;
@@ -190,8 +190,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])
@@ -923,6 +921,12 @@
cur_chunk = 0;
num_chunks = large_offsets_needed ? 5 : 4;
+ if (packs.nr - dropped_packs == 0) {
+ error(_("no pack files to index."));
+ result = 1;
+ goto cleanup;
+ }
+
written = write_midx_header(f, num_chunks, packs.nr - dropped_packs);
chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES;
@@ -1124,6 +1128,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);
@@ -1280,15 +1293,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 +1323,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 +1352,8 @@
if (!p)
continue;
+ if (!pack_kept_objects && p->pack_keep)
+ continue;
if (open_pack_index(p) || !p->num_objects)
continue;
@@ -1357,6 +1386,14 @@
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;
@@ -1365,15 +1402,23 @@
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;
+ repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset);
+ repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands);
+
argv_array_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);
+ if (delta_base_offset)
+ argv_array_push(&cmd.args, "--delta-base-offset");
+ if (use_delta_islands)
+ argv_array_push(&cmd.args, "--delta-islands");
+
if (flags & MIDX_PROGRESS)
argv_array_push(&cmd.args, "--progress");
else
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/object-store.h b/object-store.h
index be72fee..d1e490f 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"
diff --git a/object.h b/object.h
index 2dbabfc..b22328b 100644
--- a/object.h
+++ b/object.h
@@ -59,7 +59,7 @@
/*
* object flag allocation:
- * revision.h: 0---------10 25----28
+ * revision.h: 0---------10 15 25----28
* fetch-pack.c: 01
* negotiator/default.c: 2--5
* walker.c: 0-2
diff --git a/sha1-array.c b/oid-array.c
similarity index 93%
rename from sha1-array.c
rename to oid-array.c
index 3eeadfe..8657a5c 100644
--- a/sha1-array.c
+++ b/oid-array.c
@@ -1,5 +1,5 @@
#include "cache.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "sha1-lookup.h"
void oid_array_append(struct oid_array *array, const struct object_id *oid)
@@ -46,9 +46,9 @@
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,7 +62,7 @@
for_each_oid_fn fn,
void *data)
{
- int i;
+ size_t i;
if (!array->sorted)
oid_array_sort(array);
@@ -82,7 +82,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 97%
rename from sha1-array.h
rename to oid-array.h
index dc1bca9..f28d322 100644
--- a/sha1-array.h
+++ b/oid-array.h
@@ -19,7 +19,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 +49,8 @@
*/
struct oid_array {
struct object_id *oid;
- int nr;
- int alloc;
+ size_t nr;
+ size_t alloc;
int sorted;
};
diff --git a/oidset.c b/oidset.c
index f63ce81..15d4e18 100644
--- a/oidset.c
+++ b/oidset.c
@@ -36,6 +36,11 @@
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)
{
FILE *fp;
diff --git a/oidset.h b/oidset.h
index 5346563..209ae7a 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.
*/
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 49a8d10..4077e73 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -506,7 +506,8 @@
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;
@@ -599,8 +600,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;
@@ -715,8 +717,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 +727,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 +740,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 +751,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 +780,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 +789,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)
{
@@ -820,7 +835,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 +869,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 +906,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;
}
@@ -963,7 +1001,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 +1010,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");
diff --git a/parse-options-cb.c b/parse-options-cb.c
index a28b55b..86cd393 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -5,7 +5,7 @@
#include "color.h"
#include "string-list.h"
#include "argv-array.h"
-#include "sha1-array.h"
+#include "oid-array.h"
/*----- some often used options -----*/
diff --git a/parse-options.c b/parse-options.c
index 63d6bab..c57618d 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -648,6 +648,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 +660,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 +671,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;
}
diff --git a/parse-options.h b/parse-options.h
index fece5ba..46af942 100644
--- a/parse-options.h
+++ b/parse-options.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/path.c b/path.c
index 88cf593..8b2c753 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;
}
@@ -1535,5 +1535,6 @@
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..1f1bf8f 100644
--- a/path.h
+++ b/path.h
@@ -177,11 +177,12 @@
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, NULL, NULL }
const char *git_path_cherry_pick_head(struct repository *r);
const char *git_path_revert_head(struct repository *r);
@@ -190,6 +191,7 @@
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/po/bg.po b/po/bg.po
index 7990313..bb9c9ba 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -133,7 +133,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 +143,7 @@
# cone pattern matching пътеводно напасване
# negative pattern отрицателен шаблон
# colored hunk/diff оцветено парче/разлика
+# up to date обновен, освен като самостотелва дума - актуален или completely up to date - напълно актуален
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
@@ -159,10 +160,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.27\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: 2020-05-05 12:10+0200\n"
+"PO-Revision-Date: 2020-05-16 13:05+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -176,9 +177,9 @@
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:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1519
+#: builtin/rebase.c:1920
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
@@ -206,8 +207,7 @@
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:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
msgstr "индексът не може да бъде записан"
@@ -223,8 +223,8 @@
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:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
@@ -347,11 +347,11 @@
msgid "(empty) select nothing"
msgstr "(празно) без избор на нищо"
-#: 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:1851
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: 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:1848
msgid "What now"
msgstr "Избор на следващо действие"
@@ -365,10 +365,11 @@
#: 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/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:80
+#: git-add--interactive.perl:213
msgid "path"
msgstr "път"
@@ -377,27 +378,27 @@
msgstr "индексът не може да бъде обновен"
#
-#: 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:1765
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -405,7 +406,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"добавено към индекса."
-#: add-patch.c:40
+#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -419,22 +420,22 @@
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -442,7 +443,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"скътано."
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -456,22 +457,22 @@
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -479,7 +480,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"извадено от индекса."
-#: add-patch.c:84
+#: add-patch.c:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -493,23 +494,23 @@
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -517,7 +518,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"набелязано за прилагане."
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -531,7 +532,7 @@
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
@@ -539,19 +540,19 @@
"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -559,7 +560,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"набелязано за зануляване."
-#: add-patch.c:128 add-patch.c:193
+#: add-patch.c:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -576,25 +577,25 @@
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от индекса и работното дърво [y,"
"n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -611,25 +612,25 @@
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n,"
"q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -646,7 +647,7 @@
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво\n"
-#: add-patch.c:214
+#: add-patch.c:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -660,34 +661,34 @@
"a — прилагане на това и всички следващи парчета от файла\n"
"d — без прилагане на това и всички следващи парчета от файла\n"
-#: add-patch.c:318
+#: add-patch.c:319
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "заглавната част на парчето „%.*s“ не може да се анализира"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:338 add-patch.c:342
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира"
-#: add-patch.c:395
+#: add-patch.c:396
msgid "could not parse diff"
msgstr "разликата не може да се анализира"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "оцветената разлика не може да се анализира"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "изходът от „interactive.diffFilter“ не напасва"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -695,7 +696,7 @@
"Обработените редове на изхода на ползвания филтър, трябва\n"
"да се отнасят едно към едно спрямо редовете на входа."
-#: add-patch.c:761
+#: add-patch.c:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -704,7 +705,7 @@
"очаква се ред №%d от контекста в\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -717,11 +718,11 @@
" не завършва с:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -736,7 +737,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:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -746,11 +747,11 @@
"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n"
"редактирането — отказано.\n"
-#: add-patch.c:1103
+#: add-patch.c:1104
msgid "could not parse hunk header"
msgstr "заглавната част парчето не може да се анализира"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "неуспешно изпълнение на „git apply --cached“"
@@ -874,37 +875,47 @@
msgid "'git apply' failed"
msgstr "неуспешно изпълнение на „git apply“"
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"За да изключите това предупреждение, изпълнете:\n"
+" git config advice.%s false"
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:168
+#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:178
+#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: 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."
@@ -912,23 +923,23 @@
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:194
+#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:278 builtin/merge.c:1354
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:201
+#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1232,7 +1243,7 @@
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:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
@@ -1433,7 +1444,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1194
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
@@ -1560,7 +1571,7 @@
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
@@ -1570,7 +1581,7 @@
#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1333
msgid "action"
msgstr "действие"
@@ -1600,8 +1611,8 @@
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
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2188 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "повече подробности"
@@ -1621,142 +1632,6 @@
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
-
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
-
-#: archive.c:16
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО "
-"[ПЪТ…]"
-
-#: archive.c:17
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "пътят „%s“ не съвпада с никой файл"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "такъв указател няма: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "неправилно име на обект: „%s“"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "не е обект-дърво: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "текущата работна директория не е следена"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "ФОРМАТ"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "ФОРМАТ на архива"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "ПРЕФИКС"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "ФАЙЛ"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "запазване на архива в този ФАЙЛ"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "изчитане на „.gitattributes“ в работната директория"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "извеждане на архивираните файлове на стандартната грешка"
-
-#: archive.c:465
-msgid "store only"
-msgstr "съхранение без компресиране"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "бързо компресиране"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "добро компресиране"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "извеждане на списъка с поддържаните формати"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "хранилище"
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "команда"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "път към отдалечената команда „git-upload-archive“"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "Неочаквана опция „--remote“"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "Опцията „--exec“ изисква „--remote“"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Неочаквана опция „--output“"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Непознат формат на архив: „%s“"
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
-
#: archive-tar.c:125 archive-zip.c:351
#, c-format
msgid "cannot stream blob %s"
@@ -1806,6 +1681,142 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "времевата стойност е твърде голяма за тази система: %<PRIuMAX>"
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО "
+"[ПЪТ…]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
+
+#: archive.c:377 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:401
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "такъв указател няма: %.*s"
+
+#: archive.c:407
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "неправилно име на обект: „%s“"
+
+#: archive.c:420
+#, c-format
+msgid "not a tree object: %s"
+msgstr "не е обект-дърво: %s"
+
+#: archive.c:432
+msgid "current working directory is untracked"
+msgstr "текущата работна директория не е следена"
+
+#: archive.c:464
+msgid "fmt"
+msgstr "ФОРМАТ"
+
+#: archive.c:464
+msgid "archive format"
+msgstr "ФОРМАТ на архива"
+
+#: archive.c:465 builtin/log.c:1674
+msgid "prefix"
+msgstr "ПРЕФИКС"
+
+#: archive.c:466
+msgid "prepend prefix to each pathname in the archive"
+msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
+
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "ФАЙЛ"
+
+#: archive.c:468 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "запазване на архива в този ФАЙЛ"
+
+#: archive.c:470
+msgid "read .gitattributes in working directory"
+msgstr "изчитане на „.gitattributes“ в работната директория"
+
+#: archive.c:471
+msgid "report archived files on stderr"
+msgstr "извеждане на архивираните файлове на стандартната грешка"
+
+#: archive.c:472
+msgid "store only"
+msgstr "съхранение без компресиране"
+
+#: archive.c:473
+msgid "compress faster"
+msgstr "бързо компресиране"
+
+#: archive.c:481
+msgid "compress better"
+msgstr "добро компресиране"
+
+#: archive.c:484
+msgid "list supported archive formats"
+msgstr "извеждане на списъка с поддържаните формати"
+
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "хранилище"
+
+#: archive.c:487 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
+
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "команда"
+
+#: archive.c:489 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "път към отдалечената команда „git-upload-archive“"
+
+#: archive.c:496
+msgid "Unexpected option --remote"
+msgstr "Неочаквана опция „--remote“"
+
+#: archive.c:498
+msgid "Option --exec can only be used together with --remote"
+msgstr "Опцията „--exec“ изисква „--remote“"
+
+#: archive.c:500
+msgid "Unexpected option --output"
+msgstr "Неочаквана опция „--output“"
+
+#: archive.c:522
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Непознат формат на архив: „%s“"
+
+#: archive.c:529
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
+
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1898,12 +1909,12 @@
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
@@ -1943,41 +1954,41 @@
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
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1947 builtin/log.c:2237
+#: builtin/merge.c:415 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
#: builtin/shortlog.c:192
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,12 +2121,12 @@
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“ не е обновен"
@@ -2130,8 +2141,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
@@ -2184,7 +2195,7 @@
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:208 builtin/log.c:1836 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
@@ -2207,7 +2218,288 @@
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: commit-graph.c:182
+msgid "commit-graph file is too small"
+msgstr "файлът с гра̀фа на подаванията е твърде малък"
+
+#: commit-graph.c:247
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
+
+#: commit-graph.c:254
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
+
+#: commit-graph.c:261
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
+
+#: commit-graph.c:283
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"записът в таблицата за откъси липсва, файлът за гра̀фа може да е непълен"
+
+#: commit-graph.c:294
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "неправилно отместване на откъс: %08x%08x"
+
+#: commit-graph.c:363
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "откъсът %08x се явява многократно"
+
+#: commit-graph.c:435
+msgid "commit-graph has no base graphs chunk"
+msgstr "базовият откъс липсва в гра̀фа с подаванията"
+
+#: commit-graph.c:445
+msgid "commit-graph chain does not match"
+msgstr "веригата на гра̀фа с подаванията не съвпада"
+
+#: commit-graph.c:493
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
+
+#: commit-graph.c:517
+msgid "unable to find all commit-graph files"
+msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити"
+
+#: commit-graph.c:650 commit-graph.c:710
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
+
+#: commit-graph.c:671
+#, c-format
+msgid "could not find commit %s"
+msgstr "подаването „%s“ не може да бъде открито"
+
+#: commit-graph.c:947 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "подаването не може да бъде анализирано: %s"
+
+#: commit-graph.c:1095
+msgid "Writing changed paths Bloom filters index"
+msgstr "Запис на индекса за промените в пътищата следени от филтрите на Блум"
+
+#: commit-graph.c:1120
+msgid "Writing changed paths Bloom filters data"
+msgstr "Запис на данните за промените в пътищата следени от филтрите на Блум"
+
+#: commit-graph.c:1159 builtin/pack-objects.c:2782
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "видът на обекта „%s“ не може да бъде определен"
+
+#: commit-graph.c:1195
+msgid "Loading known commits in commit graph"
+msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
+
+#: commit-graph.c:1212
+msgid "Expanding reachable commits in commit graph"
+msgstr "Разширяване на достижимите подавания в гра̀фа"
+
+#: commit-graph.c:1232
+msgid "Clearing commit marks in commit graph"
+msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
+
+#: commit-graph.c:1251
+msgid "Computing commit graph generation numbers"
+msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
+
+#: commit-graph.c:1299
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
+
+#: commit-graph.c:1358
+#, 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:1371
+#, c-format
+msgid "error adding pack %s"
+msgstr "грешка при добавяне на пакетен файл „%s“"
+
+#: commit-graph.c:1375
+#, c-format
+msgid "error opening index for %s"
+msgstr "грешка при отваряне на индекса на „%s“"
+
+#: commit-graph.c:1404
+#, 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:1425
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "неправилен идентификатор на обект-подаване: „%s“"
+
+#: commit-graph.c:1441
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
+
+#: commit-graph.c:1456
+msgid "Counting distinct commits in commit graph"
+msgstr "Преброяване на различните подавания в гра̀фа"
+
+#: commit-graph.c:1488
+msgid "Finding extra edges in commit graph"
+msgstr "Откриване на още върхове в гра̀фа с подаванията"
+
+#: commit-graph.c:1537
+msgid "failed to write correct number of base graph ids"
+msgstr "правилният брой на базовите идентификатори не може да се запише"
+
+#: commit-graph.c:1571 midx.c:812
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "родителските директории на „%s“ не могат да бъдат създадени"
+
+#: commit-graph.c:1583
+msgid "unable to create temporary graph layer"
+msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
+
+#: commit-graph.c:1658
+#, 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:1703
+msgid "unable to open commit-graph chain file"
+msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
+
+#: commit-graph.c:1719
+msgid "failed to rename base commit-graph file"
+msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1739
+msgid "failed to rename temporary commit-graph file"
+msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1865
+msgid "Scanning merged commits"
+msgstr "Търсене на подаванията със сливания"
+
+#: commit-graph.c:1876
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "неочакван, повтарящ се идентификатор на подаване: %s"
+
+#: commit-graph.c:1899
+msgid "Merging commit-graph"
+msgstr "Сливане на гра̀фа с подаванията"
+
+#: commit-graph.c:2087
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания"
+
+#: commit-graph.c:2098
+msgid "too many commits to write graph"
+msgstr "прекалено много подавания за записване на гра̀фа"
+
+#: commit-graph.c:2191
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
+
+#: commit-graph.c:2201
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
+"е преди „%s“, а не трябва"
+
+#: commit-graph.c:2211 commit-graph.c:2226
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
+"трябва да е %u"
+
+#: commit-graph.c:2218
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
+
+#: commit-graph.c:2236
+msgid "Verifying commits in commit graph"
+msgstr "Проверка на подаванията в гра̀фа"
+
+#: commit-graph.c:2250
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
+"анализира"
+
+#: commit-graph.c:2257
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
+"подаванията е „%s“, а трябва да е „%s“"
+
+#: commit-graph.c:2267
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
+
+#: commit-graph.c:2276
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
+
+#: commit-graph.c:2289
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
+
+#: commit-graph.c:2294
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
+"не е"
+
+#: commit-graph.c:2298
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
+"другаде е"
+
+#: commit-graph.c:2313
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а "
+"другаде е %u"
+
+#: commit-graph.c:2319
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
+"%<PRIuMAX>"
+
+#: commit.c:51 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
@@ -2241,29 +2533,29 @@
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1153
+#: commit.c:1180
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1157
+#: commit.c:1184
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1160
+#: commit.c:1187
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1163
+#: commit.c:1190
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1417
+#: commit.c:1444
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 +2565,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:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2562,162 +2584,162 @@
" %s\n"
"Това може да се дължи на зацикляне при вмъкването."
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "ключът не съдържа раздел: „%s“"
-#: config.c:382
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:406 sequencer.c:2444
+#: config.c:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "неправилен ключ (нов ред): „%s“"
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "неправилен конфигурационен параметър: „%s“"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "неправилен формат в „%s“"
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:833
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:837
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:998
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
-#: config.c:1001
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:1004
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:1007
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
-#: config.c:1010
+#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-#: config.c:1013
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1117
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време за „%s“"
-#: config.c:1208
+#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "настройката „core.commentChar“ трябва да е само един знак"
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
@@ -2725,132 +2747,132 @@
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3541
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2097
+#: config.c:2113
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2267
+#: config.c:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2312
+#: config.c:2328
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2358
+#: config.c:2374
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2360
+#: config.c:2376
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2441
+#: config.c:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2502
+#: config.c:2518
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2754 config.c:3078
+#: config.c:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:2977
+#: config.c:2993
#, 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:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
@@ -2920,7 +2942,7 @@
#: connect.c:445
msgid "expected flush after ref listing"
-msgstr "очакваше се изчистване на буферите след изброяването на указателите"
+msgstr "след изброяването на указателите се очаква изчистване на буферите"
#: connect.c:544
#, c-format
@@ -3019,19 +3041,19 @@
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:44
msgid "Checking connectivity"
msgstr "Проверка на свързаността"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
@@ -3140,15 +3162,15 @@
msgid "external filter '%s' failed"
msgstr "неуспешно изпълнение на външния филтър „%s“"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "неочакван вид филтър"
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr "пътят е прекалено дълъг за външен филтър"
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3157,20 +3179,43 @@
"външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са "
"филтрирани"
-#: convert.c:1223
+#: convert.c:1243
msgid "true/false are no valid working-tree-encodings"
msgstr "„true“/„false“ не може да са кодирания на работното дърво"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“"
-#: convert.c:1489
+#: convert.c:1511
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“"
+#: credential.c:92
+msgid "refusing to work with credential missing host field"
+msgstr "адресът трябва задължително да съдържа хост"
+
+#: credential.c:94
+msgid "refusing to work with credential missing protocol field"
+msgstr "адресът трябва задължително да съдържа протокол"
+
+#: credential.c:375
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "адресът съдържа нов ред в частта за %s: %s"
+
+#: credential.c:396
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "адресът е без схема: %s"
+
+#: credential.c:456
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "адресът за идентификация не може да се анализира: „%s“"
+
#: date.c:138
msgid "in the future"
msgstr "в бъдещето"
@@ -3265,15 +3310,6 @@
msgid "Marked %d islands, done.\n"
msgstr "Отбелязани са %d групи, работата приключи.\n"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Търсене на преименувания на обекти съчетани с промени"
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ"
@@ -3342,38 +3378,38 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4547
+#: diff.c:4583
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:4550
+#: diff.c:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:4676
+#: diff.c:4712
#, 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
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3382,44 +3418,44 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:4822
+#: diff.c:4858
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-#: diff.c:4836
+#: diff.c:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "„%s“ не може да се открие"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "опцията „%s“ изисква знак, а не: „%s“"
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "неправилен аргумент за „--color-moved“: „%s“"
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3428,153 +3464,153 @@
"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
"„histogram“ (хистограмен)"
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "неправилен аргумент към „%s“"
-#: diff.c:5178
+#: diff.c:5214
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:5234
+#: diff.c:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "неправилен аргумент към „--word-diff“: „%s“"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "Формат на изхода за разликите"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "създаване на кръпки"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "БРОЙ"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "файловете с разлики да са в суров формат"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "„--stat“ във формат за четене от програма"
-#: diff.c:5287
+#: diff.c:5323
msgid "output only the last line of --stat"
msgstr "извеждане само на последния ред на „--stat“"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-#: diff.c:5290
+#: diff.c:5326
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "извеждане на разпределението на промените за всяка поддиректория"
-#: diff.c:5294
+#: diff.c:5330
msgid "synonym for --dirstat=cumulative"
msgstr "псевдоним на „--dirstat=cumulative“"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-#: diff.c:5302
+#: diff.c:5338
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
"празните знаци"
-#: diff.c:5305
+#: diff.c:5341
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"съкратено резюме на създадените, преименуваните и файловете с промяна на "
"режима на достъп"
-#: diff.c:5308
+#: diff.c:5344
msgid "show only names of changed files"
msgstr "извеждане само на имената на променените файлове"
-#: diff.c:5311
+#: diff.c:5347
msgid "show only names and status of changed files"
msgstr "извеждане само на имената и статистиката за променените файлове"
-#: diff.c:5313
+#: diff.c:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "извеждане на статистика за промените"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "ШИРОЧИНА"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "статистика с такава ШИРОЧИНА за промените"
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr "БРОЙ"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "кратко резюме в статистиката за промените"
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr "извеждане на двоична разлика във вид за прилагане"
-#: diff.c:5335
+#: diff.c:5371
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"показване на пълните имена на обекти в редовете за индекса при вариантите "
"преди и след промяната"
-#: diff.c:5337
+#: diff.c:5373
msgid "show colored diff"
msgstr "разлики в цвят"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "ВИД"
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3582,7 +3618,7 @@
"грешките в празните знаци да се указват в редовете за контекста, вариантите "
"преди и след разликата,"
-#: diff.c:5342
+#: diff.c:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3590,257 +3626,257 @@
"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "ПРЕФИКС"
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr "префикс вместо „a/“ за източник"
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr "префикс вместо „b/“ за цел"
-#: diff.c:5352
+#: diff.c:5388
msgid "prepend an additional prefix to every line of output"
msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-#: diff.c:5355
+#: diff.c:5391
msgid "do not show any source or destination prefix"
msgstr "без префикс за източника и целта"
-#: diff.c:5358
+#: diff.c:5394
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:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "ЗНАК"
-#: diff.c:5363
+#: diff.c:5399
msgid "specify the character to indicate a new line instead of '+'"
msgstr "знак вместо „+“ за нов вариант на ред"
-#: diff.c:5368
+#: diff.c:5404
msgid "specify the character to indicate an old line instead of '-'"
msgstr "знак вместо „-“ за стар вариант на ред"
-#: diff.c:5373
+#: diff.c:5409
msgid "specify the character to indicate a context instead of ' '"
msgstr "знак вместо „ “ за контекст"
-#: diff.c:5376
+#: diff.c:5412
msgid "Diff rename options"
msgstr "Настройки за разлики с преименуване"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-#: diff.c:5378
+#: diff.c:5414
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"заместване на пълните промени с последователност от изтриване и създаване"
-#: diff.c:5382
+#: diff.c:5418
msgid "detect renames"
msgstr "засичане на преименуванията"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "без предварителен вариант при изтриване"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "засичане на копиранията"
-#: diff.c:5393
+#: diff.c:5429
msgid "use unmodified files as source to find copies"
msgstr "търсене на копирано и от непроменените файлове"
-#: diff.c:5395
+#: diff.c:5431
msgid "disable rename detection"
msgstr "без търсене на преименувания"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "празни обекти като източник при преименувания"
-#: diff.c:5400
+#: diff.c:5436
msgid "continue listing the history of a file beyond renames"
msgstr ""
"продължаване на извеждането на историята — без отрязването при преименувания "
"на файл"
-#: diff.c:5403
+#: diff.c:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-#: diff.c:5405
+#: diff.c:5441
msgid "Diff algorithm options"
msgstr "Опции към алгоритъма за разлики"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "търсене на възможно най-малка разлика"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "без промени в празните знаци при сравняване на редове"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "без промени в празните знаци"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "без промени в празните знаци в края на редовете"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "без промени в знаците за край на ред"
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr "без промени в редовете, които са изцяло от празни знаци"
-#: diff.c:5425
+#: diff.c:5461
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"евристика за преместване на границите на парчетата за улесняване на четенето"
-#: diff.c:5428
+#: diff.c:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "разлика чрез алгоритъм за подредба като пасианс"
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "разлика по хистограмния алгоритъм"
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr "АЛГОРИТЪМ"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "избор на АЛГОРИТЪМа за разлики"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "ТЕКСТ"
-#: diff.c:5438
+#: diff.c:5474
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "разлика чрез алгоритъма със закотвяне"
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "РЕЖИМ"
-#: diff.c:5441
+#: diff.c:5477
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-#: diff.c:5444
+#: diff.c:5480
msgid "use <regex> to decide what a word is"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-#: diff.c:5447
+#: diff.c:5483
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-#: diff.c:5450
+#: diff.c:5486
msgid "moved lines of code are colored differently"
msgstr "различен цвят за извеждане на преместените редове"
-#: diff.c:5453
+#: diff.c:5489
msgid "how white spaces are ignored in --color-moved"
msgstr ""
"режим за прескачането на празните знаци при задаването на „--color-moved“"
-#: diff.c:5456
+#: diff.c:5492
msgid "Other diff options"
msgstr "Други опции за разлики"
-#: diff.c:5458
+#: diff.c:5494
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
"се ползват относителни пътища"
-#: diff.c:5462
+#: diff.c:5498
msgid "treat all files as text"
msgstr "обработка на всички файлове като текстови"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "размяна на двата входа — обръщане на разликата"
-#: diff.c:5466
+#: diff.c:5502
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"завършване с код за състояние 1 при наличието на разлики, а в противен "
"случай — с 0"
-#: diff.c:5468
+#: diff.c:5504
msgid "disable all output of the program"
msgstr "без всякакъв изход от програмата"
-#: diff.c:5470
+#: diff.c:5506
msgid "allow an external diff helper to be executed"
msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-#: diff.c:5472
+#: diff.c:5508
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-#: diff.c:5474
+#: diff.c:5510
msgid "<when>"
msgstr "КОГА"
-#: diff.c:5475
+#: diff.c:5511
msgid "ignore changes to submodules in the diff generation"
msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-#: diff.c:5478
+#: diff.c:5514
msgid "<format>"
msgstr "ФОРМАТ"
-#: diff.c:5479
+#: diff.c:5515
msgid "specify how differences in submodules are shown"
msgstr "начин за извеждане на промените в подмодулите"
-#: diff.c:5483
+#: diff.c:5519
msgid "hide 'git add -N' entries from the index"
msgstr "без включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5486
+#: diff.c:5522
msgid "treat 'git add -N' entries as real in the index"
msgstr "включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5488
+#: diff.c:5524
msgid "<string>"
msgstr "НИЗ"
-#: diff.c:5489
+#: diff.c:5525
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-#: diff.c:5492
+#: diff.c:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3848,62 +3884,71 @@
"търсене на разлики, които променят броя на поява на низовете, които напасват "
"на регулярния израз"
-#: diff.c:5495
+#: diff.c:5531
msgid "show all changes in the changeset with -S or -G"
msgstr "извеждане на всички промени с „-G“/„-S“"
-#: diff.c:5498
+#: diff.c:5534
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-#: diff.c:5501
+#: diff.c:5537
msgid "control the order in which files appear in the output"
msgstr "управление на подредбата на файловете в изхода"
-#: diff.c:5502
+#: diff.c:5538
msgid "<object-id>"
msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-#: diff.c:5503
+#: diff.c:5539
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "търсене на разлики, които променят броя на поява на указания обект"
-#: diff.c:5505
+#: diff.c:5541
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:5542
msgid "select files by diff type"
msgstr "избор на файловете по вид разлика"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "ФАЙЛ"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "Изход към указания файл"
-#: diff.c:6164
+#: diff.c:6200
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"търсенето на преименувания на обекти съчетани с промени се прескача поради "
"многото файлове."
-#: diff.c:6167
+#: diff.c:6203
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са само точните копия на променените пътища поради многото "
"файлове."
-#: diff.c:6170
+#: diff.c:6206
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Търсене на преименувания на обекти съчетани с промени"
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3935,36 +3980,36 @@
msgid "cannot use %s as an exclude file"
msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2603
+#: dir.c:2699
msgid "untracked cache is disabled on this system or location"
msgstr ""
"кешът за неследените файлове е изключен на тази система или местоположение"
-#: dir.c:3407
+#: dir.c:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr "файлът с индекса е повреден в хранилището „%s“"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:3486
+#: dir.c:3560
#, 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"
@@ -3973,7 +4018,7 @@
msgid "Filtering content"
msgstr "Филтриране на съдържанието"
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
@@ -3983,7 +4028,7 @@
msgid "bad git namespace path \"%s\""
msgstr "неправилен път към пространства от имена „%s“"
-#: environment.c:331
+#: environment.c:336
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "GIT_DIR не може да се зададе да е „%s“"
@@ -4019,32 +4064,32 @@
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:356 fetch-pack.c:1363
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:362 fetch-pack.c:1369
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:364 fetch-pack.c:1371
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:367 fetch-pack.c:1374
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:369 fetch-pack.c:1376
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:372 fetch-pack.c:1380
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
@@ -4137,104 +4182,104 @@
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1070 fetch-pack.c:1562
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1210
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1217
msgid "Server supports filter"
msgstr "Сървърът поддържа филтри"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1241
msgid "unable to write request to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1259
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1265
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1326
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1331
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1341
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1343
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1385
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1432
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1437
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1442
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1788
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1811 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:1812
+#: fetch-pack.c:1838
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1841
#, 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:272
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "Програмата „gpg“ не подписа данните."
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4253,7 +4298,7 @@
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:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4338,19 +4383,19 @@
msgid "The common Git guides are:"
msgstr "Популярните въведения в Git са:"
-#: help.c:512
+#: help.c:427
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "За повече информация за КОМАНДА изпълнете „git help КОМАНДА“"
-#: help.c:517
+#: help.c:432
msgid "External commands"
msgstr "Външни команди"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "Псевдоними на командите"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4359,36 +4404,36 @@
"Изглежда, че „%s“ е команда на git, но тя не може да\n"
"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден."
-#: help.c:655
+#: help.c:570
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-#: help.c:677
+#: help.c:592
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
"не съществува."
-#: help.c:682
+#: help.c:597
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
-#: help.c:687
+#: help.c:602
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че "
"имате предвид „%s“."
-#: help.c:695
+#: help.c:610
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-#: help.c:699
+#: help.c:614
msgid ""
"\n"
"The most similar command is"
@@ -4402,16 +4447,16 @@
"\n"
"Най-близките команди са"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git version [ОПЦИЯ…]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4482,37 +4527,11 @@
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:436 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 "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "кореновото дърво за подаване „%s“ не може да се зареди"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "няма достъп до частично изтегления обект-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:ДЪЛБОЧИНА“"
@@ -4539,6 +4558,32 @@
msgid "multiple filter-specs cannot be combined"
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"
+msgstr "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "кореновото дърво за подаване „%s“ не може да се зареди"
+
#: lockfile.c:151
#, c-format
msgid ""
@@ -4563,15 +4608,9 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "кешът не може да бъде прочетен"
-
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "неуспешно записване на новия индекс"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr "след аргументите към „ls-refs“ се очаква изчистване на буферите"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4895,7 +4934,7 @@
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
+#: merge-recursive.c:3089 git-submodule.sh:1005
msgid "submodule"
msgstr "ПОДМОДУЛ"
@@ -5013,10 +5052,20 @@
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3774 builtin/merge.c:706 builtin/merge.c:886
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "кешът не може да бъде прочетен"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "неуспешно записване на новия индекс"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -5070,62 +5119,66 @@
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:210
+#: midx.c:208
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:260
+#: midx.c:258
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr ""
"грешка при създаването на пакетен файл на базата на индекс за множество "
"пакети"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "пакетният файл за триене „%s“ не може да се открие"
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr "няма пакетни файлове за индексиране"
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "Запис на откъси към индекс за множество пакети"
-#: midx.c:1052
+#: midx.c:1056
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:1108
+#: midx.c:1112
msgid "Looking for referenced packfiles"
msgstr "Търсене на указаните пакетни файлове"
-#: midx.c:1123
+#: midx.c:1127
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5133,54 +5186,58 @@
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1132
+msgid "the midx contains no oid"
+msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
+
+#: midx.c:1141
msgid "Verifying OID order in multi-pack-index"
msgstr ""
"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
"множество пакетни файлове"
-#: midx.c:1137
+#: midx.c:1150
#, 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:1170
msgid "Sorting objects by packfile"
msgstr "Подредба на обектите по пакетни файлове"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1180
+#: midx.c:1193
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1186
+#: midx.c:1199
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1195
+#: midx.c:1208
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1233
msgid "Counting referenced objects"
msgstr "Преброяване на свързаните обекти"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "Търсене и изтриване на несвързаните пакетни файлове"
-#: midx.c:1388
+#: midx.c:1401
msgid "could not start pack-objects"
msgstr "командата „pack-objects“ не може да бъде стартирана"
-#: midx.c:1407
+#: midx.c:1420
msgid "could not finish pack-objects"
msgstr "командата „pack-objects“ не може да бъде завършена"
@@ -5272,6 +5329,11 @@
msgid "hash mismatch %s"
msgstr "разлика в контролната сума: „%s“"
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "размерът на „%s“ не може да бъде получен"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
@@ -5291,10 +5353,27 @@
"отместване преди края на индекса на пакетния файл „%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:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "неправилно име на обект „%s“"
#: parse-options.c:38
#, c-format
@@ -5337,26 +5416,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
-#: parse-options.c:857
+#: parse-options.c:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "псевдоним на „--%s“"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "непозната опция: „%s“"
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "непознат флаг „%c“"
-#: parse-options.c:861
+#: parse-options.c:858
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "непозната стойност извън „ascii“ в низа: „%s“"
-#: parse-options.c:885
+#: parse-options.c:882
msgid "..."
msgstr "…"
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
@@ -5364,47 +5448,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
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 +5521,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"
@@ -5551,7 +5608,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
@@ -5565,30 +5622,43 @@
msgstr ""
"името отдалеченото хранилище-гарант не може за започва със знака „/“: %s"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Изтриване на повтарящите се обекти"
+
+#: range-diff.c:77
msgid "could not start `log`"
msgstr "командата за журнала с подавания „log“ не може да се стартира"
-#: range-diff.c:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%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 ""
+"първият ред от изхода на командата „log“ не може да се анализира, защото не "
+"започва с „commit “: „%s“"
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "заглавната част на git „%.*s“ не може да се анализира"
-#: range-diff.c:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
-#: 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 "журналът с подаванията на „%s“ не може да бъде анализиран"
@@ -5709,9 +5779,9 @@
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
@@ -5768,12 +5838,12 @@
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:3026 strbuf.c:1174 wrapper.c:622 builtin/merge.c:1131
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
@@ -5912,14 +5982,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:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, 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:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "„%s“ не може да се запише."
@@ -5950,132 +6020,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:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, 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:1936
msgid "gone"
msgstr "изтрит"
@@ -6260,115 +6212,233 @@
msgid "malformed format string %s"
msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "извън клон, пребазиране на „%s“"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“"
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "извън клон, двоично търсене от „%s“"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "извън клон"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:2004
+#: ref-filter.c:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2389
+#: ref-filter.c:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнориране на повредения указател „%s“"
+
+#: ref-filter.c:2386
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2489
+#: ref-filter.c:2486
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "опциите „%s“ и „--merged“ са несъвместими"
-#: ref-filter.c:2492
+#: ref-filter.c:2489
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "опциите „%s“ и „--no-merged“ са несъвместими"
-#: ref-filter.c:2502
+#: ref-filter.c:2499
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: ref-filter.c:2507
+#: ref-filter.c:2504
#, c-format
msgid "option `%s' must point to a commit"
msgstr "опцията „%s“ не сочи към подаване"
-#: remote.c:366
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "„%s“ не сочи към позволен обект!"
+
+#: refs.c:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "игнориране на указател на обект извън клон „%s“"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "„%s“ не може да бъде отворен за запис: %s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "указателят „%s“ не може да се прочете"
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "указателят „%s“ вече съществува"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "неочакван идентификатор на обект при записването на „%s“"
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1171
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "в „%s“ не може да се пише"
+
+#: refs.c:816 strbuf.c:1169 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:853
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запис"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "неочакван идентификатор на обект при изтриването на „%s“"
+
+#: refs.c:954
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
+
+#: refs.c:960
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
+
+#: refs.c:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "журналът с подаванията за указателя „%s“ е празен"
+
+#: refs.c:1111
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "указател не може да се обнови с грешно име „%s“"
+
+#: refs.c:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "неуспешно обновяване на указателя „%s“: %s"
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "не са позволени повече от една промени на указателя „%s“"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновяванията на указатели са забранени в среди под карантина"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "„%s“ съществува, не може да се създаде „%s“"
+
+#: refs.c:2113 refs.c:2148
+#, 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“"
+
+#: remote.c:355
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"съкращението за отдалечено хранилище не може за започва със знака „/“: %s"
-#: remote.c:414
+#: remote.c:403
msgid "more than one receivepack given, using the first"
msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
-#: remote.c:422
+#: remote.c:411
msgid "more than one uploadpack given, using the first"
msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
-#: remote.c:612
+#: remote.c:594
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:616
+#: remote.c:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "ключ „%s“ на шаблона не съдържа „*“"
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "стойност „%s“ на шаблона не съдържа „*“"
-#: remote.c:1004
+#: remote.c:986
#, c-format
msgid "src refspec %s does not match any"
msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
-#: remote.c:1009
+#: remote.c:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
@@ -6377,7 +6447,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6401,7 +6471,7 @@
"Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n"
"указателя."
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6412,7 +6482,7 @@
"като\n"
"изтласкате към „%s:refs/heads/%s“?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6423,7 +6493,7 @@
"като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6433,7 +6503,7 @@
"ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6443,118 +6513,118 @@
"ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "не е открит клон съответстващ на „%s“"
-#: remote.c:1106
+#: remote.c:1088
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
-#: remote.c:1118
+#: remote.c:1100
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
-#: remote.c:1125
+#: remote.c:1107
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
"източник"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1646
+#: remote.c:1628
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1661
+#: remote.c:1643
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1673
+#: remote.c:1655
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1683
+#: remote.c:1665
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1696
+#: remote.c:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "отдалеченият указател „%s“ не може да бъде открит"
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "• прескачане на неочаквания локален указател „%s“"
-#: remote.c:2020
+#: remote.c:2002
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:2024
+#: remote.c:2006
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2027
+#: remote.c:2009
#, c-format
msgid "Your branch is up to date with '%s'.\n"
-msgstr "Клонът е актуализиран към „%s“.\n"
+msgstr "Клонът е обновен към „%s“.\n"
-#: remote.c:2031
+#: remote.c:2013
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
-#: remote.c:2034
+#: remote.c:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (за повече информация ползвайте „%s“)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-#: remote.c:2044
+#: remote.c:2026
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:2047
+#: remote.c:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6562,11 +6632,11 @@
msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:2055
+#: remote.c:2037
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:2058
+#: remote.c:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6581,11 +6651,11 @@
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:2068
+#: remote.c:2050
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
-#: remote.c:2251
+#: remote.c:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
@@ -6605,6 +6675,11 @@
msgid "replace depth too high for object %s"
msgstr "дълбочината на замяна е прекалено голяма за обекта: „%s“"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "Текущият компилат не поддържа контролна сума по алгоритъм „%s“."
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "повреден „MERGE_RR“ (запис за коригиране на конфликт)"
@@ -6666,7 +6741,7 @@
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1893
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6701,20 +6776,29 @@
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:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "дървото, сочено от „%s“, не може да бъде открито"
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2500
+#: revision.c:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими"
-#: revision.c:2712
+#: revision.c:2870
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
@@ -6756,15 +6840,15 @@
msgid "remote unpack failed: %s"
msgstr "неуспешно отдалечено разпакетиране: %s"
-#: send-pack.c:309
+#: send-pack.c:307
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:423
+#: send-pack.c:398
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:425
+#: send-pack.c:400
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6772,47 +6856,47 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:437
+#: send-pack.c:412
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:442
+#: send-pack.c:417
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
-#: sequencer.c:296
+#: sequencer.c:297
#, 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:316 builtin/rebase.c:744 builtin/rebase.c:1583 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "пребазиране"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "неизвестно действие: %d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6820,7 +6904,7 @@
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:392
+#: sequencer.c:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6830,44 +6914,43 @@
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
"подайте резултата с командата „git commit'“."
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:412
+#: sequencer.c:413
#, 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:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1129
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sequencer.c:466
+#: sequencer.c:457
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:470
+#: sequencer.c:461
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:502
+#: sequencer.c:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
@@ -6875,65 +6958,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "в „%.*s“ няма ключове"
-#: sequencer.c:757
+#: sequencer.c:748
#, 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:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1126 builtin/rebase.c:897
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "непозната променлива „%s“"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6962,13 +7045,13 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6997,7 +7080,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7023,337 +7106,342 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1580
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:696
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1379 sequencer.c:1450
#, 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:1406 builtin/am.c:1588 builtin/commit.c:1681 builtin/merge.c:895
+#: builtin/merge.c:920
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "„%s“ не може да се обнови"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:1662
+#: sequencer.c:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, 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:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:1804
+#: sequencer.c:1811
#, 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:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "прескачане на %s %s — кръпката вече е приложена\n"
-#: sequencer.c:2018
+#: sequencer.c:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr "преустановяване на извършваното в момента отбиране на подавания"
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "преустановяване на извършваното в момента отмяна на подаване"
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "в момента вече се извършва отмяна на подавания"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "в момента вече се извършва отбиране на подавания"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:2681
+#: sequencer.c:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
"директорията за определянето на последователността „%s“ не може да бъде "
"създадена"
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:2810
+#: sequencer.c:2830
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:2851
+#: sequencer.c:2871
msgid "no revert in progress"
msgstr "в момента не тече пребазиране"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "в момента не се извършва отбиране на подавания"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "неуспешно прескачане на подаването"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "няма какво да се прескочи"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -7363,21 +7451,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:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7396,22 +7479,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "В момента се изпълнява: %s\n"
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7426,11 +7514,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
msgid "and made changes to the index and/or the working tree\n"
msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:3141
+#: sequencer.c:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7447,102 +7535,129 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:3261
+#: sequencer.c:3279
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:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3418
+#: sequencer.c:3437
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3434
+#: sequencer.c:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:3594
+#: sequencer.c:3613
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:3610
+#: sequencer.c:3629
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3703
+msgid "Cannot autostash"
+msgstr "Не може да се скатае автоматично"
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Неочакван резултат при скатаване: „%s“"
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Директорията за „%s“ не може да бъде създадена"
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Автоматично скатано: „%s“\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "неуспешно изпълнение на „git reset --hard“"
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"Прилагането на автоматично скатаното доведе до конфликти. Промените ви са\n"
-"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
-"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
+"%s\n"
+"Промените ви са надеждно скатани. Можете да пробвате да ги приложите чрез\n"
+"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
+"поискате.\n"
-#: sequencer.c:3755
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "Конфликти при прилагането на автоматично скатаното."
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr "„%s“ е неправилен идентификатор на обект"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7565,48 +7680,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Пребазиране (%d/%d)%s"
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Успешно пребазиране и обновяване на „%s“.\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7616,59 +7741,59 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "промените в индекса не могат да бъдат подадени."
-#: sequencer.c:4338
+#: sequencer.c:4446
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:4342
+#: sequencer.c:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:5213
+#: sequencer.c:5336
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 +7804,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 +7817,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 +7834,95 @@
"\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:569
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:567
+#: setup.c:577
msgid "unknown repository extensions found:"
msgstr "открити са непознати разширения в хранилището:"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "„%s“ не може да се отвори"
-#: setup.c:588
+#: setup.c:598
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "прекалено голям файл „.git“: „%s“"
-#: setup.c:590
+#: setup.c:600
#, c-format
msgid "error reading %s"
msgstr "грешка при прочитане на „%s“"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "неправилен формат на gitfile: %s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "липсва път в gitfile: „%s“"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "не е хранилище на Git: %s"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "„%s“ е прекалено голям"
-#: setup.c:709
+#: setup.c:722
#, c-format
msgid "not a git repository: '%s'"
msgstr "не е хранилище на git: „%s“"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:751 setup.c:753 setup.c:784
#, 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:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "процесът не може да се върне към предишната работна директория"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr "Текущата работна директория не може да бъде прочетена"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:1128
+#: setup.c:1141
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:1134
+#: setup.c:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7808,7 +7933,7 @@
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7818,277 +7943,277 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: setup.c:1289
+#: setup.c:1304
msgid "open /dev/null or dup failed"
msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“"
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr "неуспешно създаване на процес чрез „fork“"
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr "неуспешно изпълнение на „setsid“"
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
"alternates“"
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-#: sha1-file.c:575
+#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
"дълбоко влагане"
-#: sha1-file.c:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "файлът с алтернативите не може да бъде прочетен"
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "неуспешно изпълнение на „mmap“"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "файлът с обектите „%s“ е празен"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr "непакетираният обект „%s“ е повреден"
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "грешни данни в края на непакетирания обект „%s“"
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "неправилен вид обект"
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
"type“"
-#: sha1-file.c:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
-#: sha1-file.c:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-#: sha1-file.c:1641
+#: sha1-file.c:1652
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-#: sha1-file.c:1746
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr "файлът „%s“ не може да бъде записан"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "правата за достъп до „%s“ не могат да бъдат зададени"
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "грешка при запис на файл"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "грешка при затварянето на файла с непакетиран обект"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-#: sha1-file.c:1847
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr "не може да бъде създаден временен файл"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "грешка при записа на файла с непакетиран обект"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#: sha1-file.c:1906 builtin/pack-objects.c:1054
#, c-format
msgid "failed utime() on %s"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "обектът за „%s“ не може да се прочете"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "повредено подаване"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "повреден етикет"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "грешка при четене по време на индексиране на „%s“"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr "непълно прочитане по време на индексиране на „%s“"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr "„%s“ не може да се вмъкне в базата от данни"
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект от вид „%s“"
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
@@ -8193,43 +8318,43 @@
msgstr "неправилно име на обект: „%.*s“"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:853
#, 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:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:863
#, 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:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:872
#, 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:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8237,18 +8362,44 @@
msgstr[1] "%u байта"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u байт/сек."
msgstr[1] "%u байта/сек."
-#: strbuf.c:1164
+#: strbuf.c:1178
#, 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 ""
@@ -8430,41 +8581,15 @@
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:2248
+#: submodule.c:2250
#, 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
#, c-format
msgid "running trailer command '%s' failed"
@@ -8519,98 +8644,6 @@
msgid "could not rename temporary file to %s"
msgstr "временният файл не може да се преименува на „%s“"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "пратката на git „%s“ не може да бъде прочетена"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: неправилна опция за дълбочина: %s"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-"За повече информация вижте раздела „protocol.version“ в „git help config“"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "опциите на сървъра изискват поне версия 2 на протокола"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "протокол версия 2 все още не се поддържа"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "непозната стойност за настройката „%s“: „%s“"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "преносът по „%s“ не е позволен"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "командата „git-over-rsync“ вече не се поддържа"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Следните пътища за подмодули съдържат промени,\n"
-"които липсват от всички отдалечени хранилища:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Пробвайте да ги изтласкате чрез командата:\n"
-"\n"
-" git push --recurse-submodules=on-demand\n"
-"\n"
-"или отидете в съответната директория и изпълнете:\n"
-"\n"
-" git push\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Преустановяване на действието."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "неуспешно изтласкване на всички необходими подмодули"
-
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "опцията не се поддържа от протокола"
-
#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr "неуспешен пълен запис към насрещната помощна програма"
@@ -8659,7 +8692,7 @@
msgid "error while running fast-import"
msgstr "грешка при изпълнението на бързо внасяне"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "указателят „%s“ не може да се прочете"
@@ -8677,6 +8710,10 @@
msgid "invalid remote service path"
msgstr "неправилен път на отдалечената услуга"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "опцията не се поддържа от протокола"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8719,27 +8756,27 @@
msgid "helper %s does not support 'push-option'"
msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"насрещната помощна програма не поддържа изтласкване. Необходимо е "
"изброяване на указателите"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "не може да се извърши бързо изнасяне"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "грешка при изпълнението на командата за бързо изнасяне"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8748,50 +8785,138 @@
"Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n"
"направено. Пробвайте да укажете клон, напр. “master“.\n"
-#: transport-helper.c:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "неправилен отговор в списъка с указатели: „%s“"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "неуспешно четене на „%s“"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "неуспешен запис в „%s“"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "неуспешно изпълнение на нишката „%s“"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-#: transport-helper.c:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "неуспешно изпълнение на „%s“"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
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:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "пратката на git „%s“ не може да бъде прочетена"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: неправилна опция за дълбочина: %s"
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+"За повече информация вижте раздела „protocol.version“ в „git help config“"
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr "опциите на сървъра изискват поне версия 2 на протокола"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "протокол версия 2 все още не се поддържа"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "непозната стойност за настройката „%s“: „%s“"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "преносът по „%s“ не е позволен"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "командата „git-over-rsync“ вече не се поддържа"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Следните пътища за подмодули съдържат промени,\n"
+"които липсват от всички отдалечени хранилища:\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Пробвайте да ги изтласкате чрез командата:\n"
+"\n"
+" git push --recurse-submodules=on-demand\n"
+"\n"
+"или отидете в съответната директория и изпълнете:\n"
+"\n"
+" git push\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "Преустановяване на действието."
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "неуспешно изтласкване на всички необходими подмодули"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "прекалено кратък обект-дърво"
@@ -8808,7 +8933,7 @@
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 +8942,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 +8951,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 +8960,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 +8969,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 +8978,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 +8987,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 +8996,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 +9005,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 +9014,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 +9023,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 +9032,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 +9041,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 +9050,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 +9060,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 +9070,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 +9079,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 +9088,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 +9097,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 +9106,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 +9120,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 +9182,14 @@
"във файлови системи, които не различават главни от малки букви)\n"
"и само един от участниците в конфликта е в работното дърво:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Обновяване на флаговете на индекса"
+#: upload-pack.c:1326
+msgid "expected flush after fetch arguments"
+msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "неправилна схема за адрес или суфиксът „://“ липсва"
@@ -9083,33 +9223,33 @@
msgid "Fetching objects"
msgstr "Доставяне на обектите"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2099
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
-#: worktree.c:305
+#: worktree.c:309
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-#: worktree.c:316
+#: worktree.c:320
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-#: worktree.c:328
+#: worktree.c:332
#, c-format
msgid "'%s' does not exist"
msgstr "„%s“ не съществува."
-#: worktree.c:334
+#: worktree.c:338
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s“ не е файл на .git, код за грешка: %d"
-#: worktree.c:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s“ не сочи към обратно към „%s“"
@@ -9165,11 +9305,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 "Промени, които не са в индекса за подаване:"
@@ -9274,22 +9414,22 @@
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Има %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 +9437,7 @@
"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -9308,257 +9448,257 @@
"Изчисляването на броя различаващи се подавания отне %.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:1692
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9570,32 +9710,32 @@
"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1757
+#: wt-status.c:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1759
+#: wt-status.c:1757
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1765
+#: wt-status.c:1763
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, 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:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9604,71 +9744,71 @@
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1779
+#: wt-status.c:1777
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1782
+#: wt-status.c:1780
#, 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:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1788
+#: wt-status.c:1786
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1792
+#: wt-status.c:1790
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1905
+#: wt-status.c:1903
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "различен"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "назад с "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2476
+#: wt-status.c:2474
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2478
+#: wt-status.c:2476
#, 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:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -9682,7 +9822,7 @@
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
@@ -9695,7 +9835,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:266 builtin/rev-parse.c:903
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
@@ -9731,8 +9871,8 @@
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/add.c:322 builtin/clean.c:904 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "пробно изпълнение"
@@ -9741,7 +9881,7 @@
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
@@ -9853,7 +9993,7 @@
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--"
@@ -9876,14 +10016,14 @@
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:501 builtin/checkout.c:1699 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища"
-#: 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:508 builtin/checkout.c:1711 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“"
@@ -10046,7 +10186,7 @@
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1700 builtin/commit.c:395
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
@@ -10098,8 +10238,8 @@
"След корекция на конфликтите изпълнете „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:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
@@ -10155,8 +10295,8 @@
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:2219 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:305 builtin/stash.c:816
msgid "be quiet"
msgstr "без извеждане на информация"
@@ -10201,17 +10341,19 @@
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:2257 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1330 builtin/repack.c:316 builtin/repack.c:320
+#: builtin/repack.c:322 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "БРОЙ"
#: builtin/am.c: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/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:82
msgid "format"
msgstr "ФОРМАТ"
@@ -10258,13 +10400,13 @@
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:2297 builtin/commit-tree.c:120 builtin/commit.c:1518
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1381 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2298 builtin/rebase.c:525 builtin/rebase.c:1382
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
@@ -10729,7 +10871,7 @@
msgid "Ignore whitespace differences"
msgstr "Без разлики в знаците за интервали"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1723
msgid "rev"
msgstr "ВЕРС"
@@ -10806,14 +10948,14 @@
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "има само %2$lu ред във файла „%1$s“"
msgstr[1] "има само %2$lu реда във файла „%1$s“"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Редове с авторство"
@@ -11025,7 +11167,7 @@
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "клон-източник"
@@ -11120,7 +11262,7 @@
#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:433
+#: builtin/tag.c:434
msgid "object"
msgstr "ОБЕКТ"
@@ -11128,16 +11270,16 @@
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:660 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c: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:684 builtin/clone.c:785
+#: builtin/branch.c:684 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
@@ -11286,7 +11428,7 @@
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,7 +11436,7 @@
"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]"
@@ -11302,79 +11444,79 @@
"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 git-submodule.sh:1004
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 +11544,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:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -11495,7 +11637,7 @@
#: 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/worktree.c:675
msgid "string"
msgstr "НИЗ"
@@ -11523,99 +11665,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:256
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:377
+#: builtin/checkout.c:395
#, 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:400
#, 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:407
#, 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:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:436
+#: builtin/checkout.c:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "не е указано нито „%s“, нито „%s“"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, 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:463 builtin/checkout.c:468
#, 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:527 builtin/checkout.c:534
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:704
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11625,50 +11767,50 @@
"индекса:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:903
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:920 builtin/checkout.c:1344
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11690,7 +11832,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11717,19 +11859,19 @@
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който все още не е създаден"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11738,7 +11880,7 @@
"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1159
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 +11902,51 @@
"\n"
" checkout.defaultRemote=origin"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1169
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s“ напасва с множество (%d) отдалечени клони"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1235
msgid "only one reference expected"
msgstr "очаква се само един указател"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, 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:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1673
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "очаква се клон, а не етикет — „%s“"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1360
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "очаква се локален, а не отдалечен клон — „%s“"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "очаква се клон, а не „%s“"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "очаква се клон, а не подаване — „%s“"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11812,7 +11954,7 @@
"по време на сливане не може да преминете към друг клон.\n"
"Пробвайте с „git merge --quit“ или „git worktree add“."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11821,7 +11963,7 @@
"клон.\n"
"Пробвайте с „git am --quit“ или „git worktree add“."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11829,7 +11971,7 @@
"по време на пребазиране не може да преминете към друг клон.\n"
"Пробвайте с „git rebase --quit“ или „git worktree add“."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11837,7 +11979,7 @@
"по време на отбиране на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11845,144 +11987,144 @@
"по време на отмяна на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git revert --quit“ или „git worktree add“."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1400
msgid "you are switching branch while bisecting"
msgstr "преминаване към друг клон по време на двоично търсене"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1450
msgid "missing branch or commit argument"
msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:167 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:565
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1494 builtin/log.c:1711 parse-options.h:322
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
msgid "conflict style (merge or diff3)"
msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1530
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1533
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1589
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1592
msgid "-p and --overlay are mutually exclusive"
msgstr "опциите „-p“ и „--overlay“ са несъвместими"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1629
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1610
+#: builtin/checkout.c:1634
msgid "missing branch name; try -b"
msgstr "липсва име на клон, използвайте опцията „-b“"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1666
#, c-format
msgid "could not resolve %s"
msgstr "„%s“ не може да бъде открит"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1682
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1689
#, 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:1693
#, 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:1702
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:1705 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "опциите „--pathspec-from-file“ и „--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."
@@ -11990,112 +12132,112 @@
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1721
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: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/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1748
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1750
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1751
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1753
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1754
msgid "use overlay mode (default)"
msgstr "използване на припокриващ режим (стандартно)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1799
msgid "create and switch to a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1801
msgid "create/reset and switch to a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1803
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git switch "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1805
msgid "throw away local modifications"
msgstr "зануляване на локалните промени"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1837
msgid "which tree-ish to checkout from"
msgstr "към кой указател към дърво да се премине"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1839
msgid "restore the index"
msgstr "възстановяване на индекса"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1841
msgid "restore the working tree (default)"
msgstr "възстановяване на работното дърво (стандартно)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1843
msgid "ignore unmerged entries"
msgstr "пренебрегване на неслетите елементи"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1844
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:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -12108,7 +12250,7 @@
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\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"
@@ -12135,27 +12277,27 @@
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 +12315,56 @@
"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:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
-#: 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
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12230,7 +12372,7 @@
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12247,7 +12389,7 @@
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
@@ -12268,11 +12410,11 @@
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "път"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
@@ -12280,11 +12422,11 @@
msgid "number of submodules cloned in parallel"
msgstr "брой подмодули, клонирани паралелно"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
@@ -12299,7 +12441,7 @@
msgstr "опцията „--reference“ може да се използва само при клониране"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3441 builtin/repack.c:328
msgid "name"
msgstr "ИМЕ"
@@ -12315,8 +12457,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "ДЪЛБОЧИНА"
@@ -12325,6 +12467,7 @@
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/pull.c:211
msgid "time"
msgstr "ВРЕМЕ"
@@ -12333,11 +12476,11 @@
msgstr "плитко клониране до момент във времето"
#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1305
msgid "revision"
msgstr "ВЕРСИЯ"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:173 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
@@ -12357,11 +12500,11 @@
msgid "any cloned submodules will be shallow"
msgstr "всички клонирани подмодули ще са плитки"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
@@ -12374,22 +12517,22 @@
msgstr "задаване на настройките на новото хранилище"
#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:172
msgid "server-specific"
msgstr "специфични за сървъра"
#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:234
+#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:237
+#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
@@ -12422,32 +12565,32 @@
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "действието завърши.\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"
@@ -12460,103 +12603,103 @@
"\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 ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "частичното изтегляне не може да се инициализира"
-#: builtin/clone.c:776
+#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "настройките не могат да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:971 builtin/receive-pack.c:1971
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:985
+#: builtin/clone.c:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1010 builtin/fetch.c:1789
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1030
#, 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:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1888 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1050
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:1064
+#: builtin/clone.c:1070
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12564,44 +12707,44 @@
"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1162
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1164
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1166
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1169
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1260
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -12637,6 +12780,103 @@
msgid "--command must be the first argument"
msgstr "опцията „--command“ трябва да е първият аргумент"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+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:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append] [--"
+"split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:179 builtin/log.c:1678
+msgid "dir"
+msgstr "директория"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
+
+#: builtin/commit-graph.c:79
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
+
+#: builtin/commit-graph.c:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Графът с подаванията не може да се отвори: „%s“"
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "непознат аргумент към „--split“: %s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "обхождането да започне от всички указатели"
+
+#: builtin/commit-graph.c:157
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+"проверка на подаванията за индексите на пакетите изброени на командния ред"
+
+#: builtin/commit-graph.c:159
+msgid "start walk at commits listed by stdin"
+msgstr "започване на обхождането при подаванията подадени на стандартния вход"
+
+#: builtin/commit-graph.c:161
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+"включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
+
+#: builtin/commit-graph.c:163
+msgid "enable computation for changed paths"
+msgstr "включване на изчисленията за променените пътища"
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
+
+#: builtin/commit-graph.c:170
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "максимален брой подавания в небазово ниво на раздробен граф"
+
+#: builtin/commit-graph.c:172
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"максимално отношение на броя подавания в две последователни нива в раздробен "
+"граф"
+
+#: builtin/commit-graph.c:174
+msgid "only expire files older than a given date-time"
+msgstr "обявяване за остарели само на файловете по-стари от това ВРЕМЕ"
+
+#: builtin/commit-graph.c:190
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими"
+
+#: builtin/commit-graph.c:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "неочакван, нешестнайсетичен идентификатор на обект: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12650,7 +12890,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:547
#, c-format
msgid "not a valid object name %s"
msgstr "неправилно име на обект: „%s“"
@@ -12678,13 +12918,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:1507 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1507
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
@@ -12692,8 +12932,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:1519 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
@@ -12741,13 +12981,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 +13016,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,38 +13090,38 @@
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099
#, 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:319
#, 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
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12885,7 +13136,7 @@
" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12901,7 +13152,7 @@
" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12910,7 +13161,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12921,147 +13172,151 @@
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "Опциите „--long“ и „-z“ са несъвместими."
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "Опциите „--reset-author“ и „--author“ са несъвместими."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не можете да поправяте."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не можете да поправяте."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1189
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "В момента се извършва пребазиране, не можете да поправяте."
+
+#: builtin/commit.c:1192
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1198
+#: builtin/commit.c:1202
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1200
+#: builtin/commit.c:1204
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1213
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:1231
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:1237
#, 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:1368 builtin/commit.c:1530
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1532
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1534
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1536 builtin/push.c:551
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1538
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1382 builtin/commit.c:1541
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1544
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1393 parse-options.h:336
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1544
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1383
+#: builtin/commit.c:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13070,11 +13325,11 @@
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1391 parse-options.h:192
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13083,176 +13338,176 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1394
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1417
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1500
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1501
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1503
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1504 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1505
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1505
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1506 builtin/gc.c:538
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1506
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:1508 builtin/commit.c:1509 builtin/commit.c:1510
+#: builtin/commit.c:1511 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1508
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1509
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1510
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1511
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1512
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1513 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "добавяне на поле за подпис — „Signed-off-by:“"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1514
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1515
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1517
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1522
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1523
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1524
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1525
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1526
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1527
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1528
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1529
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1542
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1543
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1550
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1552
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1625
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1632
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1653
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1660
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1665
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1691
+#: builtin/commit.c:1699
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13264,83 +13519,6 @@
"\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 [ОПЦИЯ…]"
@@ -13348,7 +13526,7 @@
#: builtin/config.c:104 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "непознат аргумент „--type“: %s"
+msgstr "непознат аргумент към „--type“: %s"
#: builtin/config.c:116
msgid "only one type at a time"
@@ -13677,49 +13855,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 +13901,7 @@
"Никой анотиран етикет не описва „%s“.\n"
"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13737,12 +13910,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,93 +13924,93 @@
"открити са над %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“ е несъвместима с указател към подаване"
@@ -14072,7 +14245,7 @@
msgid "Skip output of blob data"
msgstr "Без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1177 builtin/log.c:1726
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
@@ -14122,19 +14295,19 @@
msgid "fetch.parallel cannot be negative"
msgstr "опцията „fetch.parallel“ трябва да е неотрицателна"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:139 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:141 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "задаване на клон за следене за издърпване/доставяне"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:143 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:145 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
@@ -14146,7 +14319,7 @@
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:150 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
@@ -14158,7 +14331,7 @@
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:156 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
@@ -14168,7 +14341,7 @@
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
"хранилище и презаписване на променените"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:122
msgid "on-demand"
msgstr "ПРИ НУЖДА"
@@ -14176,7 +14349,7 @@
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:164 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
@@ -14184,15 +14357,16 @@
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:171 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:177 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
@@ -14208,19 +14382,19 @@
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:187 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:188 builtin/pull.c:226
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:189 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:196 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти могат са достижими при започване от този"
@@ -14228,7 +14402,7 @@
msgid "run 'gc --auto' after fetching"
msgstr "изпълняване на „gc --auto“ след доставяне"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:201 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "проверка за принудителни обновявания на всички клони"
@@ -14252,7 +14426,7 @@
#: builtin/fetch.c:755
msgid "[up to date]"
-msgstr "[актуализиран]"
+msgstr "[актуален]"
#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
msgid "[rejected]"
@@ -14320,24 +14494,24 @@
"\n"
" git config fetch.showForcedUpdates false\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:913
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:934
#, 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:1019 builtin/fetch.c:1157
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1030
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14347,57 +14521,57 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1127
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1128
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1160
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1161 builtin/remote.c:1112
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1184
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1203
#, 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:1206
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1414
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1429
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1431
msgid "not setting upstream for a remote tag"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1433
msgid "unknown branch type"
msgstr "непознат вид клон"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1435
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14405,22 +14579,22 @@
"не е открит клон за следене.\n"
"Трябва изрично да зададете един клон с опцията „--set-upstream option“."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1561 builtin/fetch.c:1624
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1571 builtin/fetch.c:1626 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1583
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1686
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14428,45 +14602,45 @@
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1723
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "опциите „--deepen“ и „--depth“ са несъвместими"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1798
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1800
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1809
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1816
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14474,31 +14648,31 @@
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
"настройката „extensions.partialClone“"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--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 "файл, от който да се чете"
@@ -14538,7 +14712,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:440
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
@@ -14784,7 +14958,7 @@
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:133
msgid "show progress"
msgstr "показване на напредъка"
@@ -14820,12 +14994,12 @@
msgid "failed to parse '%s' value '%s'"
msgstr "стойността на „%s“ — „%s“ не може да се анализира"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
@@ -14932,271 +15106,271 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
#: builtin/pack-objects.c:2854
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: 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:633
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:724
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:803
+#: builtin/grep.c:823
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:805
+#: builtin/grep.c:825
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:807
+#: builtin/grep.c:827
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:809
+#: builtin/grep.c:829
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:825
+#: builtin/grep.c:845
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr "търсене в поддиректориите (стандартно)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
msgid "show column number of first match"
msgstr "извеждане на номера на колоната на първото напасване"
-#: builtin/grep.c:847
+#: builtin/grep.c:867
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:852
+#: builtin/grep.c:872
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:854
+#: builtin/grep.c:874
msgid "synonym for --files-with-matches"
msgstr "псевдоним на „--files-with-matches“"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:859
+#: builtin/grep.c:879
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show only matching parts of a line"
msgstr "извеждане само на частите на редовете, които съвпадат"
-#: builtin/grep.c:864
+#: builtin/grep.c:884
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:865
+#: builtin/grep.c:885
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:869
+#: builtin/grep.c:889
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:872
+#: builtin/grep.c:892
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:875
+#: builtin/grep.c:895
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "псевдоним на „-C БРОЙ“"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:885
+#: builtin/grep.c:905
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:906
+#: builtin/grep.c:926
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:908
+#: builtin/grep.c:928
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулярния израз"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1003
msgid "no pattern given"
msgstr "не сте задали шаблон"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
msgid "--no-index or --untracked cannot be used with revs"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1027
+#: builtin/grep.c:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
msgid "invalid option combination, ignoring --threads"
msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1084 builtin/pack-objects.c:3547
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2851
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
msgid "--open-files-in-pager only works on the worktree"
msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1147
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1153
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1161
msgid "both --cached and trees are given"
msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
@@ -15239,66 +15413,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 +15481,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,37 +15490,37 @@
"„%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:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:366
#, 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“"
@@ -15392,6 +15566,11 @@
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
+#: builtin/index-pack.c:306 builtin/repack.c:249
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетният файл „%s“ не може да бъде създаден"
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -15554,170 +15733,181 @@
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1430
#, c-format
msgid "cannot write %s file '%s'"
msgstr "грешка при запис на файла „%s“ „%s“"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1438
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "грешка при затварянето на записания файл „%s“ „%s“"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1462
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2862
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1598
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1646
#, 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:1653
#, 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:1692
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:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1782
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "грешка при проверка с „fsck“ на пакетните обекти"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "не може да се получи информация чрез „stat“ за шаблона „%s“"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "връзката „%s“ не може да бъде прочетена"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "не може да се създаде символна връзка „%s“ в „%s“"
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "„%s“ не може да се копира в „%s“"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "игнориране на шаблона „%s“"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "няма шаблони в „%s“"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "шаблоните няма да бъдат копирани от „%s“: „%s“"
-#: builtin/init-db.c:334
+#: builtin/init-db.c:356
#, c-format
msgid "unable to handle file type %d"
msgstr "файлове от вид %d не се поддържат"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
#, 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:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+"опит за повторно задаване на първото подаване в хранилището с различна "
+"контролна сума"
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "непознат алгоритъм за контролни суми „%s“"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "Директорията „%s“ вече съществува"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, 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:459
#, 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:463
#, 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:464
#, 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:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15725,27 +15915,35 @@
"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--"
"shared[=ПРАВА]] [ДИРЕКТОРИЯ]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "права"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:544
+msgid "hash"
+msgstr "алгоритъм"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "указване на алгоритъм за контролна сума"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да се влезе в директорията „%s“"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15754,7 +15952,7 @@
"%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недостъпно"
@@ -15823,130 +16021,130 @@
msgid "no input file given for in-place editing"
msgstr "не е зададен входен файл за редактиране на място"
-#: builtin/log.c:56
+#: builtin/log.c:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна опция „--decorate“: %s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "извеждане на изходния код"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr ""
"Използване на файл за съответствията на имената и адресите на е-поща („."
"mailmap“)"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr "специален формат само на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:179
+#: builtin/log.c:184
msgid "do not decorate refs that match <pattern>"
msgstr "без специален формат на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:180
+#: builtin/log.c:185
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
-#: builtin/log.c:183
+#: builtin/log.c:188
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване само на редовете във файла в диапазона от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "обектът не може да бъде прочетен: %s"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "неизвестен вид: %d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: неправилно придружаващо писмо от режима на описание"
-#: builtin/log.c:821
+#: builtin/log.c:842
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директорията за изходната информация"
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr "файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "трябва да зададете точно един диапазон"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "не е диапазон"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr "неуспешно създаване на придружаващо писмо"
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1313
+#: builtin/log.c:1334
msgid "two output directories?"
msgstr "може да укажете максимум една директория за изход"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1445 builtin/log.c:2219 builtin/log.c:2221 builtin/log.c:2233
#, c-format
msgid "unknown commit %s"
msgstr "непознато подаване: „%s“"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "„%s“ не е указател или не сочи към нищо"
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "точната база за сливане не може да бъде открита"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15956,291 +16154,291 @@
"зададете, използвайте „git branch --set-upstream-to“.\n"
"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr "точната база при сливане не може да бъде открита"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1478
+#: builtin/log.c:1499
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1531
+#: builtin/log.c:1552
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "неуспешно определяне на диапазоните за разлика"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1632
+#: builtin/log.c:1653
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1641
+#: builtin/log.c:1662
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1644
+#: builtin/log.c:1665
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1667
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "режим-придружаващо-писмо-по-описание"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"генериране на частите на придружаващото писмо на базата на описанието на "
"клона"
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
-#: builtin/log.c:1667
+#: builtin/log.c:1688
msgid "don't include a patch matching a commit upstream"
msgstr "без кръпки, които присъстват в следения клон"
-#: builtin/log.c:1669
+#: builtin/log.c:1690
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1671
+#: builtin/log.c:1692
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1697
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1676
+#: builtin/log.c:1697
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1678
+#: builtin/log.c:1699
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1679
+#: builtin/log.c:1700
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1681
+#: builtin/log.c:1702
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1682
+#: builtin/log.c:1703
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1704 builtin/log.c:1707
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1684
+#: builtin/log.c:1705
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1687
+#: builtin/log.c:1708
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1691
+#: builtin/log.c:1712
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1693
+#: builtin/log.c:1714
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1694
+#: builtin/log.c:1715
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1695
+#: builtin/log.c:1716
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1696
+#: builtin/log.c:1717
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
-#: builtin/log.c:1698
+#: builtin/log.c:1719
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1699
+#: builtin/log.c:1720
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1701
+#: builtin/log.c:1722
msgid "show progress while generating patches"
msgstr "извеждане на напредъка във фазата на създаване на кръпките"
-#: builtin/log.c:1703
+#: builtin/log.c:1724
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
"кръпка"
-#: builtin/log.c:1706
+#: builtin/log.c:1727
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
"или единствена кръпка"
-#: builtin/log.c:1708
+#: builtin/log.c:1729
msgid "percentage by which creation is weighted"
msgstr "процент за претегляне при оценка на създаването"
-#: builtin/log.c:1792
+#: builtin/log.c:1814
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1829
msgid "-n and -k are mutually exclusive"
msgstr "опциите „-n“ и „-k“ са несъвместими"
-#: builtin/log.c:1809
+#: builtin/log.c:1831
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
-#: builtin/log.c:1817
+#: builtin/log.c:1839
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1819
+#: builtin/log.c:1841
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1821
+#: builtin/log.c:1843
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1854
+#: builtin/log.c:1876
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или стандартният, или да е в директория, но не и двете."
-#: builtin/log.c:1958
+#: builtin/log.c:1980
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
"опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1962
+#: builtin/log.c:1984
msgid "Interdiff:"
msgstr "Разлика в разликите:"
-#: builtin/log.c:1963
+#: builtin/log.c:1985
#, c-format
msgid "Interdiff against v%d:"
msgstr "Разлика в разликите спрямо v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:1991
msgid "--creation-factor requires --range-diff"
msgstr "опцията „--creation-factor“ изисква опция „--range-diff“"
-#: builtin/log.c:1973
+#: builtin/log.c:1995
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1981
+#: builtin/log.c:2003
msgid "Range-diff:"
msgstr "Диапазонна разлика:"
-#: builtin/log.c:1982
+#: builtin/log.c:2004
#, c-format
msgid "Range-diff against v%d:"
msgstr "Диапазонна разлика спрямо v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2015
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:2029
+#: builtin/log.c:2051
msgid "Generating patches"
msgstr "Създаване на кръпки"
-#: builtin/log.c:2073
+#: builtin/log.c:2095
msgid "failed to create output files"
msgstr "неуспешно създаване на изходни файлове"
-#: builtin/log.c:2132
+#: builtin/log.c:2154
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2208
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16248,109 +16446,109 @@
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\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 "извеждане на информацията за изчистване на грешки"
@@ -16368,7 +16566,7 @@
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1385
msgid "exec"
msgstr "КОМАНДА"
@@ -16443,405 +16641,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 +16661,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 +16753,405 @@
msgid "Merging %s with %s\n"
msgstr "Сливане на „%s“ с „%s“\n"
+#: builtin/merge.c:56
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
+
+#: builtin/merge.c:57
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:58
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:121
+msgid "switch `m' requires a value"
+msgstr "опцията „-m“ изисква стойност"
+
+#: builtin/merge.c:144
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "опцията „%s“ изисква стойност"
+
+#: builtin/merge.c:190
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Няма такава стратегия за сливане: „%s“.\n"
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available strategies are:"
+msgstr "Наличните стратегии са:"
+
+#: builtin/merge.c:196
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Допълнителните стратегии са:"
+
+#: builtin/merge.c:247 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "без извеждане на статистиката след завършване на сливане"
+
+#: builtin/merge.c:250 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "извеждане на статистиката след завършване на сливане"
+
+#: builtin/merge.c:251 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(псевдоним на „--stat“)"
+
+#: builtin/merge.c:253 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
+"за подаване"
+
+#: builtin/merge.c:256 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "създаване на едно подаване вместо извършване на сливане"
+
+#: builtin/merge.c:258 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "извършване на подаване при успешно сливане (стандартно действие)"
+
+#: builtin/merge.c:260 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "редактиране на съобщението преди подаване"
+
+#: builtin/merge.c:262
+msgid "allow fast-forward (default)"
+msgstr "позволяване на превъртане (стандартно действие)"
+
+#: builtin/merge.c:264 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "преустановяване, ако превъртането е невъзможно"
+
+#: builtin/merge.c:268 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
+
+#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1399 builtin/revert.c:114
+msgid "strategy"
+msgstr "СТРАТЕГИЯ"
+
+#: builtin/merge.c:270 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
+
+#: builtin/merge.c:271 builtin/pull.c:172
+msgid "option=value"
+msgstr "ОПЦИЯ=СТОЙНОСТ"
+
+#: builtin/merge.c:272 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "ОПЦИЯ за избраната стратегия за сливане"
+
+#: builtin/merge.c:274
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
+
+#: builtin/merge.c:281
+msgid "abort the current in-progress merge"
+msgstr "преустановяване на текущото сливане"
+
+#: builtin/merge.c:283
+msgid "--abort but leave index and working tree alone"
+msgstr "преустановяване без промяна на индекса и работното дърво"
+
+#: builtin/merge.c:285
+msgid "continue the current in-progress merge"
+msgstr "продължаване на текущото сливане"
+
+#: builtin/merge.c:287 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "позволяване на сливане на независими истории"
+
+#: builtin/merge.c:294
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
+"без изпълнение на куките преди подаване и сливане и при промяна на "
+"съобщението за подаване (pre-merge-commit и commit-msg)"
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "не може да се извърши скатаване"
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "неуспешно скатаване"
+
+#: 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 "неуспешно прочитане на обект-дърво"
+
+#: 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:503
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "„%s“ не сочи към подаване"
+
+#: builtin/merge.c:590
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
+
+#: builtin/merge.c:717
+msgid "Not handling anything other than two heads merge."
+msgstr "Поддържа се само сливане на точно две истории."
+
+#: builtin/merge.c:731
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
+
+#: builtin/merge.c:746
+#, c-format
+msgid "unable to write %s"
+msgstr "„%s“ не може да бъде записан"
+
+#: builtin/merge.c:798
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "От „%s“ не може да се чете"
+
+#: builtin/merge.c:807
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+"Сливането няма да бъде подадено. За завършването му и подаването му "
+"използвайте командата „git commit“.\n"
+
+#: builtin/merge.c:813
+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:818
+msgid "An empty message aborts the commit.\n"
+msgstr "Празно съобщение предотвратява подаването.\n"
+
+#: builtin/merge.c:821
+#, 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:874
+msgid "Empty commit message."
+msgstr "Празно съобщение при подаване."
+
+#: builtin/merge.c:889
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Първият етап на сливането завърши.\n"
+
+#: builtin/merge.c:950
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
+"резултата.\n"
+
+#: builtin/merge.c:989
+msgid "No current branch."
+msgstr "Няма текущ клон."
+
+#: builtin/merge.c:991
+msgid "No remote for the current branch."
+msgstr "Текущият клон не следи никой."
+
+#: builtin/merge.c:993
+msgid "No default upstream defined for the current branch."
+msgstr "Текущият клон не следи никой клон."
+
+#: builtin/merge.c:998
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
+
+#: builtin/merge.c:1055
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Неправилна стойност „%s“ в средата „%s“"
+
+#: builtin/merge.c:1158
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "не може да се слее в „%s“: %s"
+
+#: builtin/merge.c:1192
+msgid "not something we can merge"
+msgstr "не може да се слее"
+
+#: builtin/merge.c:1296
+msgid "--abort expects no arguments"
+msgstr "опцията „--abort“ не приема аргументи"
+
+#: builtin/merge.c:1300
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+"Не може да преустановите сливане, защото в момента не се извършва такова "
+"(липсва указател „MERGE_HEAD“)."
+
+#: builtin/merge.c:1318
+msgid "--quit expects no arguments"
+msgstr "опцията „--quit“ не приема аргументи"
+
+#: builtin/merge.c:1331
+msgid "--continue expects no arguments"
+msgstr "опцията „--continue“ не приема аргументи"
+
+#: builtin/merge.c:1335
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
+
+#: builtin/merge.c:1351
+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:1358
+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:1361
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
+"съществува)."
+
+#: builtin/merge.c:1375
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
+
+#: builtin/merge.c:1377
+msgid "You cannot combine --squash with --commit."
+msgstr "Опцията „--squash“ е несъвместима с „--commit“."
+
+#: builtin/merge.c:1393
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
+
+#: builtin/merge.c:1410
+msgid "Squash commit into empty head not supported yet"
+msgstr "Вкарване на подаване във връх без история все още не се поддържа"
+
+#: builtin/merge.c:1412
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+"Понеже върхът е без история, всички сливания са превъртания, не може да се "
+"извърши същинско сливане изисквано от опцията „--no-ff“"
+
+#: builtin/merge.c:1417
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "„%s“ — не е нещо, което може да се слее"
+
+#: builtin/merge.c:1419
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Можете да слеете точно едно подаване във връх без история"
+
+#: builtin/merge.c:1500
+msgid "refusing to merge unrelated histories"
+msgstr "независими истории не може да се слеят"
+
+#: builtin/merge.c:1509
+msgid "Already up to date."
+msgstr "Вече е обновено."
+
+#: builtin/merge.c:1519
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Обновяване „%s..%s“\n"
+
+#: builtin/merge.c:1565
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Проба със сливане в рамките на индекса…\n"
+
+#: builtin/merge.c:1572
+#, c-format
+msgid "Nope.\n"
+msgstr "Неуспешно сливане.\n"
+
+#: builtin/merge.c:1597
+msgid "Already up to date. Yeeah!"
+msgstr "Вече е обновено!"
+
+#: builtin/merge.c:1603
+msgid "Not possible to fast-forward, aborting."
+msgstr "Не може да се извърши превъртане, преустановяване на действието."
+
+#: builtin/merge.c:1631 builtin/merge.c:1696
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Привеждане на дървото към първоначалното…\n"
+
+#: builtin/merge.c:1635
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Пробване със стратегията за сливане „%s“…\n"
+
+#: builtin/merge.c:1687
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
+
+#: builtin/merge.c:1689
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Неуспешно сливане със стратегия „%s“.\n"
+
+#: builtin/merge.c:1698
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
+"ръка.\n"
+
+#: builtin/merge.c:1712
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Автоматичното сливане завърши успешно. Самото подаване не е извършено, "
+"защото бе зададена опцията „--no-commit“.\n"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16992,7 +17190,7 @@
"при препакетиране пакетните файлове, които са с по-малък от този размер, да "
"се обединяват в пакети с по-голям от този размер"
-#: 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 "прекалено много аргументи"
@@ -17094,7 +17292,7 @@
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:519
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
@@ -17288,7 +17486,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:533
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
@@ -17529,7 +17727,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:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
@@ -17547,7 +17745,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:131 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
@@ -17563,7 +17761,7 @@
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
@@ -17958,31 +18156,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:13
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:131
+#: builtin/prune.c:132
msgid "report pruned objects"
msgstr "информация за окастрените обекти"
-#: builtin/prune.c:134
+#: builtin/prune.c:135
msgid "expire objects older than <time>"
-msgstr "окастряне на обектите по-стари от това ВРЕМЕ"
+msgstr "обявяване на обектите по-стари от това ВРЕМЕ за остарели"
-#: builtin/prune.c:136
+#: builtin/prune.c:137
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
-#: builtin/prune.c:150
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище с важни обекти не може да се окастря"
@@ -17995,44 +18189,73 @@
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:478 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:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"Не се насърчава издърпване без указване на стратегията за съгласуване на\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:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -18040,14 +18263,14 @@
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:428
+#: builtin/pull.c:461
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:429
+#: builtin/pull.c:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18055,7 +18278,7 @@
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:432
+#: builtin/pull.c:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18066,44 +18289,44 @@
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:470 builtin/rebase.c:1235 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
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:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1241 git-parse-remote.sh:64
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1233 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Ако искате да зададете информация за следен клон, можете да направите това с "
"командата:"
-#: builtin/pull.c:466
+#: builtin/pull.c:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18112,32 +18335,28 @@
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:576
+#: builtin/pull.c:610
#, c-format
msgid "unable to access commit %s"
msgstr "недостъпно подаване: %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "опцията „--[no-]autostash“ изисква „--rebase“"
-
-#: builtin/pull.c:920
+#: builtin/pull.c:955
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:924
+#: builtin/pull.c:959
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18147,7 +18366,7 @@
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18164,15 +18383,15 @@
" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:975
+#: builtin/pull.c:1010
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
@@ -18341,102 +18560,102 @@
"указател, който вече сочи към обект, който не е подаване, както и тепърва\n"
"да го промените да сочи към подобен обект.\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "Изтласкване към „%s“\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:542
+#: builtin/push.c:544
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
-#: builtin/push.c:546
+#: builtin/push.c:548
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:547
+#: builtin/push.c:549
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:552 builtin/send-pack.c:167
msgid "force updates"
msgstr "принудително обновяване"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:554 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:555 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:556
+#: builtin/push.c:558
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:560 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:561 builtin/push.c:562 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:561
+#: builtin/push.c:563
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:564
+#: builtin/push.c:566
msgid "prune locally removed refs"
msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
-#: builtin/push.c:566
+#: builtin/push.c:568
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтласкване (pre-push)"
-#: builtin/push.c:567
+#: builtin/push.c:569
msgid "push missing but relevant tags"
msgstr ""
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:590
+#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:592
+#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
-#: builtin/push.c:612
+#: builtin/push.c:614
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:613
+#: builtin/push.c:615
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18458,27 +18677,27 @@
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:628
+#: builtin/push.c:630
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ са несъвместими"
-#: builtin/push.c:630
+#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:634
+#: builtin/push.c:636
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-#: builtin/push.c:636
+#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:639
+#: builtin/push.c:641
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-#: builtin/push.c:643
+#: builtin/push.c:645
msgid "push options must not have new line characters"
msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
@@ -18606,7 +18825,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 +18833,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:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "не може да се създаде временна директория „%s“"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "невъзможно задаване на интерактивна работа"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "файлът с командите не може да се генерира"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
msgid "a base commit must be provided with --upstream or --onto"
msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:468
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:481 builtin/rebase.c:1375
+msgid "keep commits which start empty"
+msgstr "запазванe на първоначално празните подавания"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "позволяване на празни съобщения при подаване"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr "пребазиране на подаванията със сливания"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr ""
"запазване на първоначалните точки на разклоняване на сестринските клони"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr "подписване на подаванията"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1315
msgid "display a diffstat of what changed upstream"
msgstr "извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:496
msgid "continue rebase"
msgstr "продължаване на пребазирането"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "прескачане на подаване"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "редактиране на списъка с команди за изпълнение"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "извеждане на текущата кръпка"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr "съкратени идентификатори в списъка за изпълнение"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr "пълни идентификатори в списъка за изпълнение"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr "проверка на списъка за изпълнение"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr ""
"преподреждане на редовете за вкарване на подаванията подаванията в "
"предходните им със и без смени на съобщението"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "върху"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "ограничена версия"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "ограничена версия"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "подаване, в което другите да се вкарат"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "подаване, в което другите да се вкарат"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "подаване на източника"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "име на върха"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "име на върха"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "стратегия на пребазиране"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "опции на стратегията"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "опции на стратегията"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "преминаване към"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
msgstr "клонът, към който да се премине"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr "име на база"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "име на база"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "команда"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "команда за изпълнение"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1408
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:553
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:569
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "„%s“ изисква интерактивно пребазиране"
+msgid "%s requires the merge backend"
+msgstr "„%s“ изисква пребазиране"
#: builtin/rebase.c:612
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "не може да се премине към новата база, зададена с „onto“: „%s“"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, 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:800 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 +19047,7 @@
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:883
#, c-format
msgid ""
"\n"
@@ -18860,7 +19065,7 @@
"\n"
"В резултат те не могат да се пребазират."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1209
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18869,7 +19074,7 @@
"неправилна стойност „%s“: вариантите са „drop“ (прескачане), "
"„keep“ (запазване) и „ask“ (питане)"
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"%s\n"
@@ -18886,7 +19091,7 @@
" git rebase КЛОН\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1243
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18899,143 +19104,143 @@
"\n"
" git branch --set-upstream-to=%s/КЛОН %s\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1273
msgid "exec commands cannot contain newlines"
msgstr "командите за изпълнение не може да съдържат нови редове"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1277
msgid "empty exec command"
msgstr "празна команда за изпълнение"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1306
msgid "rebase onto given branch instead of upstream"
msgstr "пребазиране върху зададения, а не следения клон"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1308
msgid "use the merge-base of upstream and branch as the current base"
msgstr "за текуща база да се ползва базата за сливане на клона и следеното"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1310
msgid "allow pre-rebase hook to run"
msgstr "позволяване на куката преди пребазиране да се изпълни"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1312
msgid "be quiet. implies --no-stat"
msgstr "без извеждане на информация. Включва опцията „--no-stat“"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1318
msgid "do not show diffstat of what changed upstream"
msgstr "без извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1321
msgid "add a Signed-off-by: line to each commit"
msgstr ""
"добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1323 builtin/rebase.c:1327 builtin/rebase.c:1329
msgid "passed to 'git am'"
msgstr "подава се на командата „git am“"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1331 builtin/rebase.c:1333
msgid "passed to 'git apply'"
msgstr "подава се на командата „git apply“"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1335 builtin/rebase.c:1338
msgid "cherry-pick all commits, even if unchanged"
msgstr "отбиране на всички подавания дори да няма промени"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1340
msgid "continue"
msgstr "продължаване"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1343
msgid "skip current patch and continue"
msgstr "прескачане на текущата кръпка и продължаване"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1345
msgid "abort and check out the original branch"
msgstr "преустановяване и възстановяване на първоначалния клон"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1348
msgid "abort but keep HEAD where it is"
msgstr "преустановяване без промяна към какво сочи „HEAD“"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1349
msgid "edit the todo list during an interactive rebase"
msgstr "редактиране на файла с команди при интерактивно пребазиране"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1352
msgid "show the patch file being applied or merged"
msgstr "показване на кръпката, която се прилага или слива"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1355
msgid "use apply strategies to rebase"
msgstr "при пребазиране да се ползва стратегия с прилагане"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1359
msgid "use merging strategies to rebase"
msgstr "при пребазиране да се ползва стратегия със сливане"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1363
msgid "let the user edit the list of commits to rebase"
msgstr ""
"позволяване на потребителя да редактира списъка с подавания за пребазиране"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1367
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1372
msgid "how to handle commits that become empty"
msgstr "как да се обработват оказалите се празни подавания"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1379
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:1386
msgid "add exec lines after each commit of the editable list"
msgstr ""
"добавяне на редове с команди за изпълнение след всяко подаване в "
"редактирания списък"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1390
msgid "allow rebasing commits with empty messages"
msgstr "позволяване на пребазиране на подавания с празни съобщения"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1394
msgid "try to rebase merges instead of skipping them"
msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1397
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"за доуточняването на следения клон, използвайте:\n"
"\n"
" git merge-base --fork-point"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1399
msgid "use the given merge strategy"
msgstr "използване на зададената стратегията на сливане"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1401 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1402
msgid "pass the argument through to the merge strategy"
msgstr "аргументът да се подаде на стратегията за сливане"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1405
msgid "rebase all reachable commits up to the root(s)"
msgstr "пребазиране на всички достижими подавания до началното им подаване"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1410
+msgid "apply all changes, even those already present upstream"
+msgstr "прилагане на всички промени, дори и наличните вече в следеното"
+
+#: builtin/rebase.c:1427
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -19043,41 +19248,45 @@
"поддръжката на „rebase.useBuiltin“ е премахната.\n"
"За повече информация вижте „git help config“."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1433
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
"пребазирате в момента."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1474
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо "
"нея."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1479
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "опциите „--keep-base“ и „--onto“ са несъвместими"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1481
msgid "cannot combine '--keep-base' with '--root'"
msgstr "опциите „--keep-base“ и „--root“ са несъвместими"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1485
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "опциите „--root“ и „--fork-point“ са несъвместими"
+
+#: builtin/rebase.c:1488
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1492
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1515
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1527
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19085,16 +19294,16 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1546
msgid "could not discard worktree changes"
msgstr "промените в работното дърво не могат да бъдат занулени"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1565
#, c-format
msgid "could not move back to %s"
msgstr "връщането към „%s“ е невъзможно"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1611
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19115,161 +19324,138 @@
"за\n"
"да не загубите случайно промени.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1639
msgid "switch `C' expects a numerical value"
msgstr "опцията „C“ очаква число за аргумент"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1681
#, c-format
msgid "Unknown mode: %s"
msgstr "Неизвестна стратегия: „%s“"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1703
msgid "--strategy requires --merge or --interactive"
msgstr ""
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1733
msgid "cannot combine apply options with merge options"
msgstr "опциите за „apply“ са несъвместими с опциите за сливане"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1746
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Непозната реализация на пребазиране: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1771
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
"опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
"interactive“"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1791
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1795
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са "
"несъвместими"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1819
#, c-format
msgid "invalid upstream '%s'"
msgstr "неправилен следен клон: „%s“"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1825
msgid "Could not create new root commit"
msgstr "Не може да се създаде ново начално подаване"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1851
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "„%s“: изисква се точно една база за сливане с клона"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1854
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s“: изисква се точно една база за пребазиране"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1862
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Указателят „%s“ не сочи към подаване"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1888
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/rebase.c:1896 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1907
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:1928
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1964
#, c-format
msgid "could not switch to %s"
msgstr "не може да се премине към „%s“"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1975
msgid "HEAD is up to date."
msgstr "Указателят „HEAD“ е напълно актуален."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1977
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Текущият клон „%s“ е напълно актуален.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:1985
msgid "HEAD is up to date, rebase forced."
msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1987
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:1995
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2002
#, c-format
msgid "Changes to %s:\n"
msgstr "Промените в „%s“:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2005
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Промените от „%s“ към „%s“:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2030
#, 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:2039
msgid "Could not detach HEAD"
msgstr "Указателят „HEAD“ не може да се отделѝ"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2048
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Превъртане на „%s“ към „%s“.\n"
@@ -19278,7 +19464,7 @@
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:842
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 +19497,7 @@
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:862
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 +19518,11 @@
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1959
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1973
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
@@ -19924,11 +20110,11 @@
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/repack.c:23
+#: builtin/repack.c:24
msgid "git repack [<options>]"
msgstr "git repack [ОПЦИЯ…]"
-#: builtin/repack.c:28
+#: builtin/repack.c:29
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19937,126 +20123,126 @@
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
-#: builtin/repack.c:191
+#: builtin/repack.c:192
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да се стартира за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:231 builtin/repack.c:417
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични "
"указатели."
-#: builtin/repack.c:254
+#: builtin/repack.c:255
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да завърши за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:292
+#: builtin/repack.c:293
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:294
+#: builtin/repack.c:295
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:297
+#: builtin/repack.c:298
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:299
+#: builtin/repack.c:300
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:301
+#: builtin/repack.c:302
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:306
+#: builtin/repack.c:307
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:311
+#: builtin/repack.c:312
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:312
+#: builtin/repack.c:313
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:314
+#: builtin/repack.c:315
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:316
+#: builtin/repack.c:317
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:318 builtin/repack.c:324
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:318
+#: builtin/repack.c:319
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:320
+#: builtin/repack.c:321
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:322
+#: builtin/repack.c:323
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:324
+#: builtin/repack.c:325
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:326
+#: builtin/repack.c:327
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:328
+#: builtin/repack.c:329
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:338
+#: builtin/repack.c:339
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:342
+#: builtin/repack.c:343
msgid "--keep-unreachable and -A are incompatible"
msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:425
+#: builtin/repack.c:426
msgid "Nothing new to pack."
msgstr "Нищо ново за пакетиране"
-#: builtin/repack.c:486
+#: builtin/repack.c:487
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -20074,7 +20260,7 @@
"ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n"
"ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:535
#, c-format
msgid "failed to remove '%s'"
msgstr "директорията „%s“ не може да бъде изтрита"
@@ -20385,96 +20571,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/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c: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,12 +20673,12 @@
"Опцията „--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 "Новият индекс не може да бъде записан."
@@ -20972,70 +21158,58 @@
"локалното хранилище"
#: 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
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:212
msgid "failed to create directory for sparse-checkout file"
msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
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:326
#, c-format
msgid "failed to open '%s'"
msgstr "„%s“ не може да се отвори"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, c-format
msgid "could not normalize path %s"
msgstr "пътят „%s“ не може да се нормализира"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:395
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | ШАБЛОН…)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:420
#, 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:474 builtin/sparse-checkout.c:498
msgid "unable to load existing sparse-checkout patterns"
msgstr "шаблоните за частично изтегляне не могат да се заредят"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:543
msgid "read patterns from standard in"
msgstr "изчитане на шаблоните от стандартния вход"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "задаване на шаблоните за частичното изтегляне"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "без използване на частично изтегляне"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "грешка при обновяване на работната директория"
@@ -21115,7 +21289,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,7 +21298,7 @@
msgid "%s is not a valid reference"
msgstr "„%s“ е неправилно име за указател"
-#: 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“ не поддържа аргументи"
@@ -21156,7 +21330,7 @@
msgid "Merging %s with %s"
msgstr "Сливане на „%s“ с „%s“"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "Индексът не е изваден от скатаното."
@@ -21179,105 +21353,107 @@
msgid "'%s' is not a stash reference"
msgstr "„%s“ не е указател към нещо скатано"
-#: 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 "Скатаното е запазено в случай, че ви потрябва отново."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: 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 "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr "съобщение при скатаване"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1046
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1173
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1182
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:1193 builtin/stash.c:1202
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1230
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1279
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:1295
msgid "Did you forget to 'git add'?"
msgstr "Пробвайте да използвате „git add“"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1310
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, 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:1427
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не могат да бъдат занулени"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "запазване на индекса"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "скатаване в режим за кръпки"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "без извеждане на информация"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "include untracked files in stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1473 builtin/stash.c:1538
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "„%s“ не може да се изпълни"
+#: builtin/stash.c:1573
+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]"
@@ -21728,12 +21904,12 @@
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:2241 git-submodule.sh:176
#, 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:2291 git.c:435 git.c:682
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
@@ -21763,11 +21939,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:486
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr "причина за обновяването"
@@ -21860,134 +22036,134 @@
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "принудително редактиране на съобщение за етикет"
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:420
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "Опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "Опцията „-points-at“ изисква режим на списък."
-#: builtin/tag.c:512
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък."
-#: builtin/tag.c:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -22285,21 +22461,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr "изтриване на указателя"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr ""
"някои от елементите подадени на стандартния вход завършват с нулевия знак "
"„NUL“"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "изчитане на указателите от стандартния вход"
@@ -22392,7 +22568,7 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -22477,120 +22653,120 @@
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:435 builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Приготвяне на работното дърво (нов клон „%s“)"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
"„%s“)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:452
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:493
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:496
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
msgid "set up tracking mode (see git-branch(1))"
msgstr "задаване на режима на следене (виж git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
msgid "--[no-]track can only be used if a new branch is created"
msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:676
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:690 builtin/worktree.c:723
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"не може да местите или изтривате работни дървета, в които има подмодули"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:774
msgid "force move even if worktree is dirty or locked"
msgstr ""
"принудително преместване, дори работното дърво да не е чисто или да е "
"заключено"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s“ е основно работно дърво"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "името на целта не може да се определи от „%s“"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr "целта „%s“ вече съществува"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22599,7 +22775,7 @@
"не може да преместите заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22607,41 +22783,41 @@
"не може да преместите заключено работно дърво:\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:821
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
"проверките са неуспешни, работното дърво не може да бъде преместено: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:826
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:874
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "не може да изпълни „git status“ върху „%s“"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:878
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"„%s“ съдържа променени или нови файлове, за принудително изтриване е "
"необходима опцията „--force“"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:883
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:906
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"принудително изтриване, дори работното дърво да не е чисто или да е заключено"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22650,7 +22826,7 @@
"не може да изтриете заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22658,7 +22834,7 @@
"не може да изтриете заключено работно дърво:\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
@@ -22679,17 +22855,113 @@
msgid "only useful for debugging"
msgstr "само за изчистване на грешки"
-#: fast-import.c:3125
+#: bugreport.c:12
+msgid "git version:\n"
+msgstr "версия на git:\n"
+
+#: bugreport.c:18
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
+
+#: bugreport.c:28
+msgid "compiler info: "
+msgstr "компилатор: "
+
+#: bugreport.c:30
+msgid "libc info: "
+msgstr "библиотека на C: "
+
+#: bugreport.c:35
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ]"
+
+#: bugreport.c:42
+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"
+
+#: bugreport.c:81
+msgid "specify a destination for the bugreport file"
+msgstr "укажете файла, в който да се запази докладът за грешка"
+
+#: bugreport.c:83
+msgid "specify a strftime format suffix for the filename"
+msgstr "укажете суфикса на файла във формат за „strftime“"
+
+#: bugreport.c:107
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "родителските директории на „%s“ не могат да бъдат създадени"
+
+#: bugreport.c:114
+msgid "System Info"
+msgstr "Информация за системата"
+
+#: bugreport.c:122
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "новият файл „%s“ не може да бъде създаден"
+
+#: bugreport.c:134
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Новият доклад е създаден в „%s“.\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Липсват маркери „от“ за подмодула „%s“"
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Липсват маркери „до“ за подмодула „%s“"
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
-msgstr "очаква се команда „mark“, а бе получена: „%s“"
+msgstr "Очаква се команда „mark“, а бе получена: „%s“"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
-msgstr "очаква се команда „to“, а бе получена: „%s“"
+msgstr "Очаква се команда „to“, а бе получена: „%s“"
-#: fast-import.c:3254
+#: fast-import.c:3317
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "Опцията за презапис на подмодул изисква формат: име:име_на_файл"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“"
@@ -22794,12 +23066,12 @@
msgid "unknown option: %s\n"
msgstr "непозната опция: „%s“\n"
-#: git.c:360
+#: git.c:361
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "при заместването на псевдоним „%s“: „%s“"
-#: git.c:369
+#: git.c:370
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22808,39 +23080,39 @@
"псевдонимът „%s“ променя променливи на средата.\n"
"За това може да ползвате „!git“ в псевдонима"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "празен псевдоним за „%s“"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "зациклен псевдоним: „%s“"
-#: git.c:459
+#: git.c:462
msgid "write failure on standard output"
msgstr "грешка при запис на стандартния изход"
-#: git.c:461
+#: git.c:464
msgid "unknown write failure on standard output"
msgstr "неизвестна грешка при запис на стандартния изход"
-#: git.c:463
+#: git.c:466
msgid "close failed on standard output"
msgstr "грешка при затваряне на стандартния изход"
-#: git.c:793
+#: git.c:791
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:843
+#: git.c:841
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "„%s“ не може да се обработи като вградена команда"
-#: git.c:856
+#: git.c:854
#, c-format
msgid ""
"usage: %s\n"
@@ -22849,60 +23121,60 @@
"употреба: %s\n"
"\n"
-#: git.c:876
+#: git.c:874
#, 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:886
#, 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:914
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0"
-#: http.c:949
+#: http.c:993
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0"
-#: http.c:1086
+#: http.c:1139
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
-#: http.c:1093
+#: http.c:1146
#, 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:1150
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
"друга"
-#: http.c:1966
+#: http.c:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23031,6 +23303,14 @@
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: непозната команда „%s“ от git"
+#: 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:85
msgid "args"
msgstr "АРГУМЕНТИ"
@@ -23088,11 +23368,11 @@
"при възможност преизползване на решението на конфликта за обновяване на "
"индекса"
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "Указателят „HEAD“ не е свързан и е при "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
@@ -23135,634 +23415,638 @@
msgstr "Извеждане, създаване, изтриване на клони"
#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Събиране на информация за потребителя за доклад за грешка"
+
+#: command-list.h:60
msgid "Move objects and refs by archive"
msgstr "Местене на обекти и указатели по архиви"
-#: command-list.h:60
+#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr ""
"Предоставяне на съдържанието или вида и размерите на обекти от хранилище"
-#: command-list.h:61
+#: command-list.h:62
msgid "Display gitattributes information"
msgstr "Извеждане на информацията за атрибутите на git (gitattributes)"
-#: command-list.h:62
+#: command-list.h:63
msgid "Debug gitignore / exclude files"
msgstr "Изчистване на грешки в игнорираните файлове (gitignore)"
-#: command-list.h:63
+#: command-list.h:64
msgid "Show canonical names and email addresses of contacts"
msgstr "Извеждане на каноничните име и адрес на е-поща на контактите"
-#: command-list.h:64
+#: command-list.h:65
msgid "Switch branches or restore working tree files"
msgstr ""
"Преминаване към друг клон или възстановяване на файловете в работното дърво"
-#: command-list.h:65
+#: command-list.h:66
msgid "Copy files from the index to the working tree"
msgstr "Копиране на файлове от индекса към работното дърво"
-#: command-list.h:66
+#: command-list.h:67
msgid "Ensures that a reference name is well formed"
msgstr "Проверка дали името на указателя е по правилата"
-#: command-list.h:67
+#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr ""
"Откриване на подавания, които още не са подадени към отдалеченото хранилище"
-#: command-list.h:68
+#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
msgstr "Прилагане на промените от съществуващи подавания"
-#: command-list.h:69
+#: command-list.h:70
msgid "Graphical alternative to git-commit"
msgstr "Графична алтернатива на „git-commit“"
-#: command-list.h:70
+#: command-list.h:71
msgid "Remove untracked files from the working tree"
msgstr "Изтриване на неследените файлове от работното дърво"
-#: command-list.h:71
+#: command-list.h:72
msgid "Clone a repository into a new directory"
msgstr "Клониране на хранилище в нова директория"
-#: command-list.h:72
+#: command-list.h:73
msgid "Display data in columns"
msgstr "Извеждане по колони"
-#: command-list.h:73
+#: command-list.h:74
msgid "Record changes to the repository"
msgstr "Подаване на промени в хранилището"
-#: command-list.h:74
+#: command-list.h:75
msgid "Write and verify Git commit-graph files"
msgstr "Запис и проверка на файловете с гра̀фа на подаванията на Git"
-#: command-list.h:75
+#: command-list.h:76
msgid "Create a new commit object"
msgstr "Създаване на нов обект-подаване"
-#: command-list.h:76
+#: command-list.h:77
msgid "Get and set repository or global options"
msgstr ""
"Извеждане и задаване на глобални настройки или настройки на определено "
"хранилище"
-#: command-list.h:77
+#: command-list.h:78
msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
"Преброяване на непакетираните обекти и колко дисково пространство заемат"
-#: command-list.h:78
+#: command-list.h:79
msgid "Retrieve and store user credentials"
msgstr "Получаване и запазване на идентификацията на потребител"
-#: command-list.h:79
+#: command-list.h:80
msgid "Helper to temporarily store passwords in memory"
msgstr "Помощна програма за временно запазване на пароли в паметта"
-#: command-list.h:80
+#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr ""
"Помощна програма за запазване на идентификацията на потребител на диска"
-#: command-list.h:81
+#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
msgstr "Изнасяне на едно подаване като изтегляне в CVS"
-#: command-list.h:82
+#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
msgstr "Изнасяне на данните ви от друга система за контрол на версиите"
-#: command-list.h:83
+#: command-list.h:84
msgid "A CVS server emulator for Git"
msgstr "Емулация на сървър за CVS за Git"
-#: command-list.h:84
+#: command-list.h:85
msgid "A really simple server for Git repositories"
msgstr "Силно опростен сървър за хранилища на Git"
-#: command-list.h:85
+#: command-list.h:86
msgid "Give an object a human readable name based on an available ref"
msgstr ""
"Задаване на име удобно за потребителите на обект въз основа на наличен "
"указател"
-#: command-list.h:86
+#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Извеждане на разликите между подаванията, версиите, работното дърво"
-#: command-list.h:87
+#: command-list.h:88
msgid "Compares files in the working tree and the index"
msgstr "Сравняване на файлове от работното дърво и индекса"
-#: command-list.h:88
+#: command-list.h:89
msgid "Compare a tree to the working tree or index"
msgstr "Сравняване на обекти-дърво с работното дърво и индекса"
-#: command-list.h:89
+#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
"Сравняване на съдържанието и правата за достъп на обектите-BLOB чрез два "
"обекта-дърво"
-#: command-list.h:90
+#: command-list.h:91
msgid "Show changes using common diff tools"
msgstr "Извеждане на промените чрез стандартните инструменти за това"
-#: command-list.h:91
+#: command-list.h:92
msgid "Git data exporter"
msgstr "Разглеждане на данните от Git"
-#: command-list.h:92
+#: command-list.h:93
msgid "Backend for fast Git data importers"
msgstr "Ядро за бързо внасяне на данни в Git"
-#: command-list.h:93
+#: command-list.h:94
msgid "Download objects and refs from another repository"
msgstr "Изтегляне на обекти и указатели от друго хранилище"
-#: command-list.h:94
+#: command-list.h:95
msgid "Receive missing objects from another repository"
msgstr "Получаване на липсващи обекти от друго хранилище"
-#: command-list.h:95
+#: command-list.h:96
msgid "Rewrite branches"
msgstr "Презаписване на клони"
-#: command-list.h:96
+#: command-list.h:97
msgid "Produce a merge commit message"
msgstr "Създаване на съобщение при подаване със сливане"
-#: command-list.h:97
+#: command-list.h:98
msgid "Output information on each ref"
msgstr "Извеждане на информацията за всеки указател"
-#: command-list.h:98
+#: command-list.h:99
msgid "Prepare patches for e-mail submission"
msgstr "Подготвяне на кръпки за изпращане по е-поща"
-#: command-list.h:99
+#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Проверка на обектите и връзките тях в базата от данни за обектите"
-#: command-list.h:100
+#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Изчистване на ненужните файлове и оптимизиране на локалното хранилище"
-#: command-list.h:101
+#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Извеждане на идентификатора на подаване от архив на „git-archive“"
-#: command-list.h:102
+#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "Извеждане на редовете напасващи на шаблон"
-#: command-list.h:103
+#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "Графичен интерфейс към Git"
-#: command-list.h:104
+#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
"Изчисляване на идентификатор на обект и евентуално създаване на обект-BLOB "
"от файл"
-#: command-list.h:105
+#: command-list.h:106
msgid "Display help information about Git"
msgstr "Извеждане на помощта за Git"
-#: command-list.h:106
+#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "Сървърна реализация на Git по HTTP"
-#: command-list.h:107
+#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "Изтегляне на отдалечено хранилище по HTTP"
-#: command-list.h:108
+#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Изтласкване на обекти по HTTP/DAV към друго хранилище"
-#: command-list.h:109
+#: command-list.h:110
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "Изпращане на поредица от кръпки на стандартния вход към папка по IMAP"
-#: command-list.h:110
+#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr "Създаване на пакетен индекс за съществуващ пакетиран архив"
-#: command-list.h:111
+#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Създаване на празно хранилище на Git или зануляване на съществуващо"
-#: command-list.h:112
+#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "Незабавно разглеждане на работното ви хранилище чрез „gitweb“"
-#: command-list.h:113
+#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr ""
"Добавяне или обработка на структурирана информация в съобщенията при подаване"
-#: command-list.h:114
+#: command-list.h:115
msgid "The Git repository browser"
msgstr "Разглеждане на хранилище на Git"
-#: command-list.h:115
+#: command-list.h:116
msgid "Show commit logs"
msgstr "Извеждане на журнала с подаванията"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "Извеждане на информация за файловете в индекса и работното дърво"
-#: command-list.h:117
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Извеждане на указателите в отдалечено хранилище"
-#: command-list.h:118
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Извеждане на съдържанието на обект-дърво"
-#: command-list.h:119
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Изваждане на кръпка и авторството от е-писмо"
-#: command-list.h:120
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Проста програма за разделяне на файлове във формат UNIX mbox"
-#: command-list.h:121
+#: command-list.h:122
msgid "Join two or more development histories together"
msgstr "Сливане на две или повече поредици/истории от промени"
-#: command-list.h:122
+#: command-list.h:123
msgid "Find as good common ancestors as possible for a merge"
msgstr "Откриване на най-подходящите общи предшественици за сливане"
-#: command-list.h:123
+#: command-list.h:124
msgid "Run a three-way file merge"
msgstr "Изпълнение на тройно сливане"
-#: command-list.h:124
+#: command-list.h:125
msgid "Run a merge for files needing merging"
msgstr "Сливане на файловете, които се нуждаят от това"
-#: command-list.h:125
+#: command-list.h:126
msgid "The standard helper program to use with git-merge-index"
msgstr "Стандартната помощна програма за „git-merge-index“"
-#: command-list.h:126
+#: command-list.h:127
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане"
-#: command-list.h:127
+#: command-list.h:128
msgid "Show three-way merge without touching index"
msgstr "Извеждане на тройно сливане без промяна на индекса"
-#: command-list.h:128
+#: command-list.h:129
msgid "Write and verify multi-pack-indexes"
msgstr "Запис и проверка на индексите за множество пакети"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "Създаване на обект-етикет"
-#: command-list.h:130
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Създаване на обект-дърво от текст във формат „ls-tree“"
-#: command-list.h:131
+#: command-list.h:132
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Преместване или преименуване на файл, директория или символна връзка"
-#: command-list.h:132
+#: command-list.h:133
msgid "Find symbolic names for given revs"
msgstr "Откриване на имената дадени на версия"
-#: command-list.h:133
+#: command-list.h:134
msgid "Add or inspect object notes"
msgstr "Добавяне или преглед на бележки към обект"
-#: command-list.h:134
+#: command-list.h:135
msgid "Import from and submit to Perforce repositories"
msgstr "Внасяне и подаване към хранилища на Perforce"
-#: command-list.h:135
+#: command-list.h:136
msgid "Create a packed archive of objects"
msgstr "Създаване на пакетиран архив от обекти"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "Намиране на повтарящи се пакетни файлове"
-#: command-list.h:137
+#: command-list.h:138
msgid "Pack heads and tags for efficient repository access"
msgstr "Пакетиране на върховете и етикетите за бърз достъп до хранилище"
-#: command-list.h:138
+#: command-list.h:139
msgid "Routines to help parsing remote repository access parameters"
msgstr ""
"Помощни програми за анализа на параметрите за достъп до отдалечено хранилище"
-#: command-list.h:139
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Генериране на уникален идентификатор на кръпка"
-#: command-list.h:140
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "Окастряне на всички недостижими обекти в базата от данни за обектите"
-#: command-list.h:141
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Изтриване на допълнителните обекти, които вече са в пакетни файлове"
-#: command-list.h:142
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Доставяне и внасяне на промените от друго хранилище или клон"
-#: command-list.h:143
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "Обновяване на отдалечените указатели и свързаните с тях обекти"
-#: command-list.h:144
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Прилагане на поредица от кръпки от quilt към текущия клон"
-#: command-list.h:145
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "Сравняване на два диапазона от подавания (напр. две версии на клон)"
-#: command-list.h:146
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Изчитане на информация за обект-дърво в индекса"
-#: command-list.h:147
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Прилагане на подаванията върху друг връх"
-#: command-list.h:148
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Получаване на изтласканото в хранилището"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Управление на информацията в журнала на указателите"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Управление на набор от следени хранилища"
-#: command-list.h:151
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Пакетиране на непакетираните обекти в хранилище"
-#: command-list.h:152
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Създаване, извеждане, изтриване на указатели за замяна на обекти"
-#: command-list.h:153
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Обобщение на предстоящите промени"
-#: command-list.h:154
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Преизползване на вече запазено коригиране на конфликт при сливане"
-#: command-list.h:155
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Привеждане на указателя „HEAD“ към зададеното състояние"
-#: command-list.h:156
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Възстановяване на файловете в работното дърво"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "Отменяне на съществуващи подавания"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "Извеждане на подаванията в обратна хронологическа подредба"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Избор и промяна на параметри"
-#: command-list.h:160
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Изтриване на файлове от работното дърво и индекса"
-#: command-list.h:161
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Изпращане на поредица от кръпки по е-поща"
-#: command-list.h:162
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Изтласкване на обекти по протокола на Git към друго хранилище"
-#: command-list.h:163
+#: command-list.h:164
msgid "Restricted login shell for Git-only SSH access"
msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
-#: command-list.h:164
+#: command-list.h:165
msgid "Summarize 'git log' output"
msgstr "Обобщен изход от „git log“"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "Извеждане на различните видове обекти в Git"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "Извеждане на клоните и подаванията в тях"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "Извеждане на индекса на пакетирания архив"
-#: command-list.h:168
+#: command-list.h:169
msgid "List references in a local repository"
msgstr "Извеждане на указателите в локално хранилище"
-#: command-list.h:169
+#: command-list.h:170
msgid "Git's i18n setup code for shell scripts"
msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
-#: command-list.h:170
+#: command-list.h:171
msgid "Common Git shell script setup code"
msgstr "Настройки на Git за скриптовете на обвивката"
-#: command-list.h:171
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Инициализиране и промяна на частичното изтегляне"
-#: command-list.h:172
+#: command-list.h:173
msgid "Stash the changes in a dirty working directory away"
msgstr "Скатаване на неподадените промени в работното дърво"
-#: command-list.h:173
+#: command-list.h:174
msgid "Add file contents to the staging area"
msgstr "Добавяне на съдържанието на файла към индекса"
-#: command-list.h:174
+#: command-list.h:175
msgid "Show the working tree status"
msgstr "Извеждане на състоянието на работното дърво"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Премахване на излишните знаци за интервали"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Инициализиране, обновяване или разглеждане на подмодули"
-#: command-list.h:177
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двупосочна работа между хранилища под Subversion и Git"
-#: command-list.h:178
+#: command-list.h:179
msgid "Switch branches"
msgstr "Преминаване към друг клон"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Извеждане, промяна и изтриване на символни указатели"
-#: command-list.h:180
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
-#: command-list.h:181
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
-#: command-list.h:182
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Разпакетиране на обекти от пакетиран архив"
-#: command-list.h:183
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
-#: command-list.h:184
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "Безопасно обновяване на името на обект в указател"
-#: command-list.h:185
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
-#: command-list.h:186
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Изпращане на архива обратно към „git-archive“"
-#: command-list.h:187
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
-#: command-list.h:188
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Извеждане на логическа променлива на Git"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Проверка на подписите GPG върху подаванията"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Проверка на пакетираните архивни файлове на Git"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Проверка на подписите GPG върху етикетите"
-#: command-list.h:192
+#: command-list.h:193
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Уеб интерфейс на Git"
-#: command-list.h:193
+#: command-list.h:194
msgid "Show logs with difference each commit introduces"
msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
-#: command-list.h:194
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Управление на множество работни дървета"
-#: command-list.h:195
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "Създаване на обект-дърво от текущия индекс"
-#: command-list.h:196
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Команден ред и конвенции на Git"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Въвеждащ урок в Git за разработчици"
-#: command-list.h:199
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git за потребители на CVS"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Настройване на изгледа на разликите"
-#: command-list.h:201
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
-#: command-list.h:202
+#: command-list.h:203
msgid "A Git Glossary"
msgstr "Речник с термините на Git"
-#: command-list.h:203
+#: command-list.h:204
msgid "Hooks used by Git"
msgstr "Куки на Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: command-list.h:205
+#: command-list.h:206
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: command-list.h:206
+#: command-list.h:207
msgid "Git namespaces"
msgstr "Пространства от имена на Git"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git Repository Layout"
msgstr "Устройство на хранилището на Git"
-#: command-list.h:208
+#: command-list.h:209
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: command-list.h:209
+#: command-list.h:210
msgid "Mounting one repository inside another"
msgstr "Монтиране на едно хранилище в друго"
-#: command-list.h:210
+#: command-list.h:211
msgid "A tutorial introduction to Git: part two"
msgstr "Въвеждащ урок за Git: втора част"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git"
msgstr "Въвеждащ урок за Git"
-#: command-list.h:212
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
@@ -23891,138 +24175,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:205
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Относителен път може да се ползва само от основната директория на работното "
"дърво"
-#: git-submodule.sh:213
+#: git-submodule.sh:215
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с "
"„./“ или „../“"
-#: git-submodule.sh:232
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "„${sm_path}“ вече съществува в индекса"
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, 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:244
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "в „${sm_path}“ не е изтеглено подаване"
-#: git-submodule.sh:273
+#: git-submodule.sh:275
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса"
-#: git-submodule.sh:275
+#: git-submodule.sh:277
#, 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:285
#, 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:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -24039,37 +24237,37 @@
"правилното хранилище или ако не знаете какво означава това, използвайте\n"
"друго име като аргумент към опцията „--name“."
-#: git-submodule.sh:291
+#: git-submodule.sh:293
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново."
-#: git-submodule.sh:303
+#: git-submodule.sh:305
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-#: git-submodule.sh:308
+#: git-submodule.sh:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Неуспешно добавяне на подмодула „${sm_path}“"
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Неуспешно регистриране на подмодула „${sm_path}“"
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:600
+#: git-submodule.sh:602
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:605
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -24078,7 +24276,7 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -24087,7 +24285,7 @@
"Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно "
"доставяне на „${sha1}“"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -24096,80 +24294,80 @@
"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
"„${sha1}“. Директното доставяне на това подаване е неуспешно."
-#: git-submodule.sh:636
+#: git-submodule.sh:638
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-#: git-submodule.sh:637
+#: git-submodule.sh:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:642
+#: git-submodule.sh:644
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-#: git-submodule.sh:647
+#: git-submodule.sh:649
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:648
+#: git-submodule.sh:650
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-#: git-submodule.sh:653
+#: git-submodule.sh:655
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:654
+#: git-submodule.sh:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:896
+#: git-submodule.sh:898
msgid "The --cached option cannot be used with the --files option"
msgstr "Опциите „--cached“ и „--files“ са несъвместими"
-#: git-submodule.sh:948
+#: git-submodule.sh:950
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неочакван режим „${mod_dst}“"
-#: git-submodule.sh:968
+#: git-submodule.sh:970
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“"
-#: git-submodule.sh:971
+#: git-submodule.sh:973
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“"
-#: git-submodule.sh:974
+#: git-submodule.sh:976
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -24190,6 +24388,16 @@
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)"
@@ -25292,3 +25500,157 @@
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
+
+#, c-format
+#~ msgid "unable to adjust shared permissions for '%s'"
+#~ msgstr "правата за споделен достъп до „%s“ не могат да бъдат зададени"
+
+#, c-format
+#~ msgid "skipping credential lookup for key: credential.%s"
+#~ msgstr ""
+#~ "прескачане на търсенето на идентификация според ключа: „credential.%s“"
+
+#~ msgid "Suppress output for setting url of a submodule"
+#~ msgstr "Без извеждане на информация при задаването на адреса на подмодул"
+
+#~ msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+#~ msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]"
+
+#~ msgid "not run from a git repository - no hooks to show\n"
+#~ msgstr "командата е стартирана извън хранилище на Git, затова няма куки\n"
+
+#~ msgid "Enabled Hooks"
+#~ msgstr "Включени куки"
+
+#, c-format
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Частичното изтегляне не може да бъде обновено: следните записи не са "
+#~ "актуални:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Обновяването на частичното изтегляне ще презапише тези файлове в "
+#~ "работното дърво:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Обновяването на частичното изтегляне ще изтрие тези файлове в работното "
+#~ "дърво:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "в анотирания етикет „%s“ липсва вградено име"
+
+#~ msgid "automatically stash/stash pop before and after rebase"
+#~ msgstr ""
+#~ "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "опцията „--[no-]autostash“ изисква „--rebase“"
+
+#~ msgid "(DEPRECATED) keep empty commits"
+#~ msgstr "(ОСТАРЯЛО) запазване на празните подавания"
+
+#, c-format
+#~ msgid "Could not read '%s'"
+#~ msgstr "Пътят „%s“ не може да бъде прочетен"
+
+#, c-format
+#~ msgid "Cannot store %s"
+#~ msgstr "„%s“ не може да бъде запазен"
+
+#~ msgid "initialize sparse-checkout"
+#~ msgstr "инициализиране на частичното изтегляне"
+
+#~ msgid "set sparse-checkout patterns"
+#~ msgstr "задаване на шаблоните за частичното изтегляне"
+
+#~ msgid "disable sparse-checkout"
+#~ msgstr "без използване на частично изтегляне"
+
+#, c-format
+#~ msgid "could not exec %s"
+#~ msgstr "„%s“ не може да се изпълни"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "Временният индекс не може да бъде изтрит"
+
+#, sh-format
+#~ msgid "Cannot update $ref_stash with $w_commit"
+#~ msgstr ""
+#~ "Указателят „${ref_stash}“ не може да бъде обновен да сочи към "
+#~ "„${w_commit}“"
+
+#, sh-format
+#~ msgid "error: unknown option for 'stash push': $option"
+#~ msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“"
+
+#, sh-format
+#~ msgid "Saved working directory and index state $stash_msg"
+#~ msgstr ""
+#~ "Състоянието на работната директория и индекса са запазени: „$stash_msg“"
+
+#, sh-format
+#~ msgid "unknown option: $opt"
+#~ msgstr "непозната опция: ${opt}"
+
+#, sh-format
+#~ msgid "Too many revisions specified: $REV"
+#~ msgstr "Указани са прекалено много версии: „${REV}“"
+
+#, sh-format
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "Указателят „${reference}“ е грешен"
+
+#, sh-format
+#~ msgid "'$args' is not a stash-like commit"
+#~ msgstr "„${args}“ не е подаване, приличащо на нещо скатано"
+
+#, sh-format
+#~ msgid "'$args' is not a stash reference"
+#~ msgstr "„${args}“ не е указател към нещо скатано"
+
+#~ msgid "unable to refresh index"
+#~ msgstr "индексът не може да бъде обновен"
+
+#~ msgid "Cannot apply a stash in the middle of a merge"
+#~ msgstr "По време на сливане не може да приложите нещо скатано"
+
+#~ msgid "Conflicts in index. Try without --index."
+#~ msgstr ""
+#~ "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
+#~ "index“."
+
+#~ msgid "Could not save index tree"
+#~ msgstr "Дървото сочено от индекса не може да бъде запазено"
+
+#~ msgid "Could not restore untracked files from stash entry"
+#~ msgstr "Неследени файлове не могат да се възстановят от скатаното"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr "Променените файлове не могат да бъдат извадени от индекса"
+
+#, sh-format
+#~ msgid "Dropped ${REV} ($s)"
+#~ msgstr "Изтрито е скатаното „${REV}“ ($s)"
+
+#, sh-format
+#~ msgid "${REV}: Could not drop stash entry"
+#~ msgstr "Скатаното „${REV}“ не може да бъде изтрито"
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)"
diff --git a/po/fr.po b/po/fr.po
index 314ff37..6b30fb9 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: 2020-05-15 09:11+0800\n"
+"PO-Revision-Date: 2020-05-15 21:35+0200\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -91,9 +92,9 @@
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:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
msgid "could not read index"
msgstr "impossible de lire l'index"
@@ -121,8 +122,7 @@
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:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
msgstr "impossible d'écrire l'index"
@@ -138,8 +138,8 @@
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:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
@@ -265,11 +265,11 @@
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:1083 builtin/clean.c:816 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: 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:1848
msgid "What now"
msgstr "Et maintenant ?"
@@ -281,12 +281,13 @@
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
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr "chemin"
@@ -294,27 +295,27 @@
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:1157 builtin/clean.c:781 git-add--interactive.perl:1765
#, 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:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -322,7 +323,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:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -336,22 +337,22 @@
"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:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -359,7 +360,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:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -373,22 +374,22 @@
"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:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -396,7 +397,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:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -410,22 +411,22 @@
"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:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -433,7 +434,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:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -447,25 +448,25 @@
"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
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -473,7 +474,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:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -487,24 +488,24 @@
"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:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -518,27 +519,27 @@
"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:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -552,7 +553,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:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -566,34 +567,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:319
#, 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:338 add-patch.c:342
#, 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:396
msgid "could not parse diff"
msgstr "impossible d'analyser la diff"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "impossible d'analyser la diff colorée"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "échec pour lancer '%s'"
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "sortie sans correspondance depuis interactive.diffFilter"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -601,7 +602,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:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -610,7 +611,7 @@
"ligne de contexte attendue #%d dans\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -623,12 +624,12 @@
"\tne se termine pas par :\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -642,7 +643,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:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -652,11 +653,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:1104
msgid "could not parse hunk header"
msgstr "impossible d'analyser l'entête de section"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' a échoué"
@@ -779,37 +780,44 @@
msgid "'git apply' failed"
msgstr "'git apply' a échoué"
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr "\nDésactivez ce message avec \"git config advice.%s false\""
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sastuce: %.*s%s\n"
-#: advice.c:168
+#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
-#: advice.c:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:178
+#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
-#: advice.c: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."
@@ -817,23 +825,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:273
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:278 builtin/merge.c:1353
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:280
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1135,7 +1143,7 @@
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:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
@@ -1336,7 +1344,7 @@
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:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
@@ -1402,7 +1410,7 @@
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:4973 builtin/am.c:2259
msgid "num"
msgstr "num"
@@ -1460,7 +1468,7 @@
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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
@@ -1468,9 +1476,9 @@
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:5008 builtin/am.c:2238 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:3458 builtin/rebase.c:1332
msgid "action"
msgstr "action"
@@ -1501,8 +1509,8 @@
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
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "mode verbeux"
@@ -1516,7 +1524,7 @@
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:5032 builtin/am.c:2247
msgid "root"
msgstr "racine"
@@ -1524,142 +1532,6 @@
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
-
-#: 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 <dépôt> [--exec <commande>] [<options>] <arbre ou "
-"apparenté> [<chemin>...]"
-
-#: archive.c:17
-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"
@@ -1699,7 +1571,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
@@ -1709,6 +1581,142 @@
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>...]"
+
+#: 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 <dépôt> [--exec <commande>] [<options>] <arbre ou "
+"apparenté> [<chemin>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
+
+#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "le chemin '%s' ne correspond à aucun fichier"
+
+#: archive.c:401
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "référence inexistante : %.*s"
+
+#: archive.c:407
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nom d'objet invalide : %s"
+
+#: archive.c:420
+#, c-format
+msgid "not a tree object: %s"
+msgstr "objet arbre invalide : %s"
+
+#: archive.c:432
+msgid "current working directory is untracked"
+msgstr "l'arbre de travail actuel est non-suivi"
+
+#: archive.c:464
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:464
+msgid "archive format"
+msgstr "format d'archive"
+
+#: archive.c:465 builtin/log.c:1674
+msgid "prefix"
+msgstr "préfixe"
+
+#: archive.c:466
+msgid "prepend prefix to each pathname in the archive"
+msgstr "préfixer chaque chemin de fichier dans l'archive"
+
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "fichier"
+
+#: archive.c:468 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "écrire l'archive dans ce fichier"
+
+#: archive.c:470
+msgid "read .gitattributes in working directory"
+msgstr "lire .gitattributes dans le répertoire de travail"
+
+#: archive.c:471
+msgid "report archived files on stderr"
+msgstr "afficher les fichiers archivés sur stderr"
+
+#: archive.c:472
+msgid "store only"
+msgstr "stockage seulement"
+
+#: archive.c:473
+msgid "compress faster"
+msgstr "compression rapide"
+
+#: archive.c:481
+msgid "compress better"
+msgstr "compression efficace"
+
+#: archive.c:484
+msgid "list supported archive formats"
+msgstr "afficher les formats d'archive supportés"
+
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "dépôt"
+
+#: archive.c:487 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:488 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "commande"
+
+#: archive.c:489 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "chemin vers la commande distante git-upload-archive"
+
+#: archive.c:496
+msgid "Unexpected option --remote"
+msgstr "Option --remote inattendue"
+
+#: archive.c:498
+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:500
+msgid "Unexpected option --output"
+msgstr "Option --output inattendue"
+
+#: archive.c:522
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format d'archive inconnu '%s'"
+
+#: archive.c:529
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument non supporté pour le format '%s' : -%d"
+
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1802,12 +1810,12 @@
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:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
@@ -1847,41 +1855,41 @@
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
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
-#: blame.c:2762
+#: blame.c: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,12 +2032,12 @@
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"
@@ -2044,8 +2052,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -2097,7 +2105,7 @@
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:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -2120,18 +2128,310 @@
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:183
+msgid "commit-graph file is too small"
+msgstr "le graphe de commit est trop petit"
+
+#: commit-graph.c:248
+#, 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:255
+#, 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:262
+#, 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:284
+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:294
+#, 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:362
+#, 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:436
+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:446
+msgid "commit-graph chain does not match"
+msgstr "la chaîne de graphe de commit ne correspond pas"
+
+#: commit-graph.c:494
+#, 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:518
+msgid "unable to find all commit-graph files"
+msgstr "impossible de trouver tous les fichiers du graphe de commit"
+
+#: commit-graph.c:651 commit-graph.c:711
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"position de commit invalide. Le graphe de commit est vraisemblablement "
+"corrompu"
+
+#: commit-graph.c:672
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossible de trouver le commit %s"
+
+#: commit-graph.c:948 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossible d'analyser le commit %s"
+
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr "Écriture de l'index des filtres Bloom des chemins modifiés"
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr "Écriture des données des filtres Bloom des chemins modifiés"
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "impossible d'obtenir le type de l'objet %s"
+
+#: commit-graph.c:1196
+msgid "Loading known commits in commit graph"
+msgstr "Lecture des commits connus dans un graphe de commit"
+
+#: commit-graph.c:1213
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expansion des commits joignables dans un graphe de commit"
+
+#: commit-graph.c:1233
+msgid "Clearing commit marks in commit graph"
+msgstr "Suppression les marques de commit dans le graphe de commits"
+
+#: commit-graph.c:1252
+msgid "Computing commit graph generation numbers"
+msgstr "Calcul des chiffres de génération du graphe de commits"
+
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
+
+#: commit-graph.c:1359
+#, 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:1372
+#, c-format
+msgid "error adding pack %s"
+msgstr "erreur à l'ajout du packet %s"
+
+#: commit-graph.c:1376
+#, c-format
+msgid "error opening index for %s"
+msgstr "erreur à l'ouverture de l'index pour %s"
+
+#: commit-graph.c:1405
+#, 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:1426
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "identifiant d'objet commit invalide : %s"
+
+#: commit-graph.c:1442
+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:1457
+msgid "Counting distinct commits in commit graph"
+msgstr "Comptage des commits distincts dans un graphe de commit"
+
+#: commit-graph.c:1489
+msgid "Finding extra edges in commit graph"
+msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
+
+#: commit-graph.c:1538
+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:1572 midx.c:812
+#, 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:1585
+msgid "unable to create temporary graph layer"
+msgstr "impossible de créer une couche de graphe temporaire"
+
+#: commit-graph.c:1590
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossible de régler les droits partagés pour '%s'"
+
+#: commit-graph.c:1667
+#, 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:1712
+msgid "unable to open commit-graph chain file"
+msgstr "impossible d'ouvrir le fichier de graphe de commit"
+
+#: commit-graph.c:1728
+msgid "failed to rename base commit-graph file"
+msgstr "échec du renommage du fichier de graphe de commits"
+
+#: commit-graph.c:1748
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossible de renommer le fichier temporaire de graphe de commits"
+
+#: commit-graph.c:1874
+msgid "Scanning merged commits"
+msgstr "Analyse des commits de fusion"
+
+#: commit-graph.c:1885
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de commit %s dupliqué inattendu"
+
+#: commit-graph.c:1908
+msgid "Merging commit-graph"
+msgstr "fusion du graphe de commits"
+
+#: commit-graph.c:2096
+#, 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:2107
+msgid "too many commits to write graph"
+msgstr "trop de commits pour écrire un graphe"
+
+#: commit-graph.c:2200
+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:2210
+#, 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:2220 commit-graph.c:2235
+#, 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:2227
+#, 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:2245
+msgid "Verifying commits in commit graph"
+msgstr "Verification des commits dans le graphe de commits"
+
+#: commit-graph.c:2259
+#, 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:2266
+#, 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:2276
+#, 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:2285
+#, 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:2298
+#, 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:2303
+#, 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:2307
+#, 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:2322
+#, 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:2328
+#, 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:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "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 +2451,27 @@
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1168
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1432
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 +2483,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:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2478,306 +2502,306 @@
"\t%s\n"
"possibilité d'inclusions multiples."
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "expansion impossible du chemin d'inclusion '%s'"
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr ""
"les conditions d'inclusion de configuration relative doivent venir de "
"fichiers"
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clé ne contient pas de section: %s"
-#: config.c:382
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clé ne contient pas de nom de variable : %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "clé invalide (retour chariot) : %s"
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "paramètre de configuration mal formé: %s"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "formatage mal formé dans %s"
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:833
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:837
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: config.c:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "hors plage"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:998
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
"%s : %s"
-#: config.c:1001
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
"%s : %s"
-#: config.c:1004
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
"standard : %s"
-#: config.c:1007
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
"sous-module %s : %s"
-#: config.c:1010
+#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
"commande %s : %s"
-#: config.c:1013
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: config.c:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1117
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: config.c:1208
+#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr "longueur d'abbrev hors plage : %d"
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "core.commentChar ne devrait être qu'un unique caractère"
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3542
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la référence '%s' ne pointe pas sur un blob"
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2097
+#: config.c:2113
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2267
+#: config.c:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2312
+#: config.c:2328
#, 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:2374
#, 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:2376
#, 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:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2502
+#: config.c:2518
#, 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:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "impossible de réaliser un map de '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2977
+#: config.c:2993
#, 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:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
@@ -2943,19 +2967,19 @@
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
@@ -3058,15 +3082,15 @@
msgid "external filter '%s' failed"
msgstr "le filtre externe '%s' a échoué"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "type de filtre inattendu"
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr "nom de chemin trop long pour un filtre externe"
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3075,20 +3099,48 @@
"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
"n'aient pas été filtrés"
-#: convert.c:1223
+#: convert.c:1243
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:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s : le filtre clean '%s' a échoué"
-#: convert.c:1489
+#: convert.c:1511
#, 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:396
+#, 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:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'url n'a pas de schéma : %s"
+
+#: credential.c:513
+#, 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,15 +3235,6 @@
msgid "Marked %d islands, done.\n"
msgstr "Marquage de %d îlots, fait.\n"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "impossible de lire le fichier de commande '%s'"
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Détection de renommage inexact en cours"
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<options>] <chemin> <chemin>"
@@ -3256,35 +3299,35 @@
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, 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:4583
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:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4676
+#: diff.c:4712
#, 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
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s attend une valeur numérique"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3293,42 +3336,42 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, 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:4858
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valeur inconnue après ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "forme <n>/<m> attendue par %s"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "caractère attendu par %s, '%s' trouvé"
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mauvais argument --color-moved : %s"
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode invalide '%s' dans --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3336,155 +3379,155 @@
"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "argument invalide pour %s"
-#: diff.c:5178
+#: diff.c:5214
#, 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:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mauvais argument pour --word-diff : %s"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "Options de format de sortie de diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "générer la rustine"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "générer les diffs avec <n> lignes de contexte"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "générer le diff en format brut"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "synonyme de '-p --raw'"
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "synonyme de '-p --stat'"
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "--stat pour traitement automatique"
-#: diff.c:5287
+#: diff.c:5323
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:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5326
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:5330
msgid "synonym for --dirstat=cumulative"
msgstr "synonyme pour --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonyme pour --dirstat=files,param1,param2..."
-#: diff.c:5302
+#: diff.c:5338
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:5341
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:5344
msgid "show only names of changed files"
msgstr "n'afficher que les noms de fichiers modifiés"
-#: diff.c:5311
+#: diff.c:5347
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:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "générer un diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "<largeur>"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "générer un diffstat avec la largeur indiquée"
-#: diff.c:5320
+#: diff.c:5356
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:5359
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:5361
msgid "<count>"
msgstr "<compte>"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "générer un diffstat avec des lignes limitées"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "générer une résumé compact dans le diffstat"
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr "produire un diff binaire qui peut être appliqué"
-#: diff.c:5335
+#: diff.c:5371
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:5373
msgid "show colored diff"
msgstr "afficher un diff coloré"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "<sorte>"
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3492,7 +3535,7 @@
"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
"'nouveau' dans le diff"
-#: diff.c:5342
+#: diff.c:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3500,93 +3543,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:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "<préfixe>"
-#: diff.c:5346
+#: diff.c:5382
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:5385
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:5388
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:5391
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:5394
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:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "<caractère>"
-#: diff.c:5363
+#: diff.c:5399
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:5404
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:5409
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:5412
msgid "Diff rename options"
msgstr "Options de renommage de diff"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5414
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:5418
msgid "detect renames"
msgstr "détecter les renommages"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "supprimer la pré-image pour les suppressions"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "détecter les copies"
-#: diff.c:5393
+#: diff.c:5429
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:5431
msgid "disable rename detection"
msgstr "désactiver la détection de renommage"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "utiliser des blobs vides comme source de renommage"
-#: diff.c:5400
+#: diff.c:5436
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:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3594,161 +3637,161 @@
"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:5441
msgid "Diff algorithm options"
msgstr "Options de l'algorithme de diff"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "produire le diff le plus petit possible"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "ignorer les espaces lors de la comparaison de ligne"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "ignorer des modifications du nombre d'espaces"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "ignorer des modifications d'espace en fin de ligne"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "ignore le retour chariot en fin de ligne"
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr "ignorer les modifications dont les lignes sont vides"
-#: diff.c:5425
+#: diff.c:5461
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:5464
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:5468
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:5470
msgid "<algorithm>"
msgstr "<algorithme>"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "choisir un algorithme de différence"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "<texte>"
-#: diff.c:5438
+#: diff.c:5474
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:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5441
+#: diff.c:5477
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"afficher des différences par mot, en utilisant <mode> pour délimiter les "
"mots modifiés"
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5444
+#: diff.c:5480
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:5483
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5450
+#: diff.c:5486
msgid "moved lines of code are colored differently"
msgstr "les lignes déplacées sont colorées différemment"
-#: diff.c:5453
+#: diff.c:5489
msgid "how white spaces are ignored in --color-moved"
msgstr "comment les espaces sont ignorés dans --color-moved"
-#: diff.c:5456
+#: diff.c:5492
msgid "Other diff options"
msgstr "Autres options diff"
-#: diff.c:5458
+#: diff.c:5494
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:5498
msgid "treat all files as text"
msgstr "traiter les fichiers comme texte"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "échanger les entrées, inverser le diff"
-#: diff.c:5466
+#: diff.c:5502
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:5504
msgid "disable all output of the program"
msgstr "désactiver tous les affichages du programme"
-#: diff.c:5470
+#: diff.c:5506
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:5508
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:5510
msgid "<when>"
msgstr "<quand>"
-#: diff.c:5475
+#: diff.c:5511
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:5514
msgid "<format>"
msgstr "<format>"
-#: diff.c:5479
+#: diff.c:5515
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:5519
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:5522
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:5524
msgid "<string>"
msgstr "<chaîne>"
-#: diff.c:5489
+#: diff.c:5525
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3756,7 +3799,7 @@
"rechercher les différences qui modifient le nombre d'occurrences de la "
"chaîne spécifiée"
-#: diff.c:5492
+#: diff.c:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3764,26 +3807,26 @@
"rechercher les différences qui modifient le nombre d'occurrences de la regex "
"spécifiée"
-#: diff.c:5495
+#: diff.c:5531
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:5534
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:5537
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:5538
msgid "<object-id>"
msgstr "<id-objet>"
-#: diff.c:5503
+#: diff.c:5539
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3791,35 +3834,35 @@
"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
"indiqué"
-#: diff.c:5505
+#: diff.c:5541
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:5542
msgid "select files by diff type"
msgstr "sélectionner les fichiers par types de diff"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "<fichier>"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "Sortie vers un fichier spécifié"
-#: diff.c:6164
+#: diff.c:6200
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:6203
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:6206
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3827,6 +3870,15 @@
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "impossible de lire le fichier de commande '%s'"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Détection de renommage inexact en cours"
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3859,35 +3911,35 @@
msgid "cannot use %s as an exclude file"
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2603
+#: dir.c:2699
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:3481
#, 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:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:3486
+#: dir.c:3560
#, 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 ""
@@ -3898,17 +3950,17 @@
msgid "Filtering content"
msgstr "Filtrage du contenu"
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "Espaces de nom de Git \"%s\""
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "impossible de régler GIT_DIR à '%s'"
@@ -3918,245 +3970,245 @@
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : liste superficielle attendue"
-#: fetch-pack.c:153
+#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack : paquet de vidage attendu après une liste superficielle"
-#: fetch-pack.c:164
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:195
+#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "impossible d'écrire sur un distant"
-#: fetch-pack.c:257
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:357 fetch-pack.c:1364
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:363 fetch-pack.c:1370
#, 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:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:340
msgid "done"
msgstr "fait"
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:819
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:827
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:917
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, 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:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 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:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr "Le serveur supporte %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr "Le serveur ne supporte les requêtes superficielles"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr "Le serveur supporte filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr "impossible d'écrire la requête sur le distant"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, 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:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
msgid "expected packfile to be sent after 'ready'"
msgstr "fichier paquet attendu à envoyer après 'ready'"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1344
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:1386
#, 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:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, 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:1789
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:1812
+#: fetch-pack.c:1839
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, 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:272
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg n'a pas pu signer les données"
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4175,7 +4227,7 @@
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:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4252,7 +4304,7 @@
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:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "type de liste de commandes non supporté '%s'"
@@ -4261,21 +4313,21 @@
msgid "The common Git guides are:"
msgstr "Les guides Git populaires sont :"
-#: help.c:512
+#: help.c:427
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:432
msgid "External commands"
msgstr "Commandes externes"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "Alias de commande"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4284,33 +4336,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:570
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:592
#, 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:597
#, 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:602
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
-#: help.c:695
+#: help.c:610
#, 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:614
msgid ""
"\n"
"The most similar command is"
@@ -4324,16 +4376,16 @@
"\n"
"Les commandes les plus ressemblantes sont"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4401,38 +4453,11 @@
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:436 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "impossible de charger l'arbre racine pour le commit %s"
-
-#: 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>'"
@@ -4460,7 +4485,34 @@
msgid "multiple filter-specs cannot be combined"
msgstr "impossible de combiner des spécificateurs multiples de filtre"
-#: lockfile.c:151
+#: 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"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "impossible de charger l'arbre racine pour le commit %s"
+
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4479,20 +4531,14 @@
"un processus git peut avoir planté :\n"
"supprimez le fichier manuellement pour poursuivre."
-#: lockfile.c:159
+#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Impossible de créer '%s.lock' : %s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "impossible de lire le cache"
-
-#: merge.c:107 rerere.c:720 builtin/am.c: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:109
+msgid "expected flush after ls-refs arguments"
+msgstr "vidage attendu après les arguments ls-refs"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4805,7 +4851,7 @@
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
+#: merge-recursive.c:3089 git-submodule.sh:985
msgid "submodule"
msgstr "sous-module"
@@ -4925,10 +4971,20 @@
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:3774 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "impossible de lire le cache"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "impossible d'écrire le nouveau fichier d'index"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4983,58 +5039,62 @@
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:210
+#: midx.c:208
#, 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:258
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"
-#: midx.c:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "Ajout de fichiers paquet à un index multi-paquet"
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "fichier paquet à éliminer %s non trouvé"
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr "Aucun fichier paquet à l'index."
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "Écriture des sections dans l'index multi-paquet"
-#: midx.c:1052
+#: midx.c:1056
#, 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:1112
msgid "Looking for referenced packfiles"
msgstr "Recherche de fichiers paquets référencés"
-#: midx.c:1123
+#: midx.c:1127
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5042,51 +5102,55 @@
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:1128
+#: midx.c:1132
+msgid "the midx contains no oid"
+msgstr "le midx ne contient aucun oid"
+
+#: midx.c:1141
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:1150
#, 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:1170
msgid "Sorting objects by packfile"
msgstr "Classement des objets par fichier paquet"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1180
+#: midx.c:1193
#, 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:1199
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1195
+#: midx.c:1208
#, 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:1233
msgid "Counting referenced objects"
msgstr "Comptage des objets référencés"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "Recherche et effacement des fichiers paquets non-référencés"
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr "Impossible de démarrer le groupement d'objets"
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr "Impossible de finir le groupement d'objets"
@@ -5169,6 +5233,11 @@
msgid "hash mismatch %s"
msgstr "incohérence de hachage %s"
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossible de récupérer la taille de %s"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
@@ -5184,10 +5253,25 @@
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:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objet malformé '%s'"
#: parse-options.c:38
#, c-format
@@ -5229,26 +5313,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:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "alias pour --%s"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "option inconnue « %s »"
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "bascule inconnue « %c »"
-#: parse-options.c:861
+#: parse-options.c:858
#, 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:882
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -5256,45 +5345,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
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 +5421,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"
@@ -5446,7 +5510,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "impossible de créer le lstat en fil : %s"
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
@@ -5459,29 +5523,40 @@
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:77
msgid "could not start `log`"
msgstr "impossible de démarrer `log`"
-#: range-diff.c:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le 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 "impossible d'analyser la première ligne de la sortie de `log` : ne commence pas par 'commit' : '%s'"
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "impossible d'analyser l'entête git '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:301
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:534 range-diff.c:536
#, c-format
msgid "could not parse log for '%s'"
msgstr "impossible d'analyser le journal pour '%s'"
@@ -5599,9 +5674,9 @@
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
@@ -5656,12 +5731,12 @@
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:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, 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:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
@@ -5794,14 +5869,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:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, 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:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "impossible d'écrire '%s'."
@@ -5833,133 +5908,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:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, 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:1936
msgid "gone"
msgstr "disparue"
@@ -6145,116 +6102,234 @@
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "aucune branche, rebasage de %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "aucune branche, rebasage de la HEAD détachée %s"
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "aucune branche, bisect a démarré sur %s"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "aucune branche"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, 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:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, 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:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "réf cassé %s ignoré"
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "l'option « %s » est incompatible avec --merged"
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, 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:2508
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'option '%s' doit pointer sur un commit"
-#: remote.c:366
+#: 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:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "symref pendant %s ignoré"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "impossible d'ouvrir '%s' en écriture : %s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "impossible de lire la réf '%s'"
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "la référence '%s' existe déjà"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "id d'objet inattendu pendant l'écriture de '%s'"
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossible d'écrire dans '%s'"
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "id d'objet inattendu pendant la suppression de '%s'"
+
+#: refs.c:954
+#, 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:960
+#, 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:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "le journal pour la réf %s est vide"
+
+#: refs.c:1111
+#, 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:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "échec de update_ref pour la réf '%s' : %s"
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mises à jour multiples pour la réf '%s' non permises"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe ; impossible de créer '%s'"
+
+#: refs.c:2113 refs.c:2148
+#, 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'"
+
+#: remote.c:355
#, 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:403
msgid "more than one receivepack given, using the first"
msgstr "plus d'un receivepack fournis, utilisation du premier"
-#: remote.c:422
+#: remote.c:411
msgid "more than one uploadpack given, using the first"
msgstr "plus d'un uploadpack fournis, utilisation du premier"
-#: remote.c:612
+#: remote.c:594
#, 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:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:688
+#: remote.c:670
#, 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:680
#, 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:986
#, 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:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -6264,7 +6339,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6288,7 +6363,7 @@
"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
"totalement qualifiée."
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6299,7 +6374,7 @@
"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
"'%s:refs/heads/%s' ?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6310,7 +6385,7 @@
"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6321,7 +6396,7 @@
"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6332,119 +6407,119 @@
"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1095
+#: remote.c:1077
#, 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:1088
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "suppression d '%s' impossible : la référence distante n'existe pas"
-#: remote.c:1118
+#: remote.c:1100
#, 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:1107
#, 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:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1646
+#: remote.c:1628
#, 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:1643
#, 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:1655
#, 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:1665
#, 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:1678
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:1700
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:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "impossible de trouver la référence distante %s"
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Référence bizarre '%s' ignorée localement"
-#: remote.c:2020
+#: remote.c:2002
#, 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:2006
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2027
+#: remote.c:2009
#, 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:2013
#, 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:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (utilisez \"%s\" pour plus de détails)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "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:2026
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:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6456,11 +6531,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:2037
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:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6475,12 +6550,12 @@
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2068
+#: remote.c:2050
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:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "impossible d'analyser le nom attendu d'objet '%s'"
@@ -6500,6 +6575,11 @@
msgid "replace depth too high for object %s"
msgstr "profondeur de remplacement trop grande pour l'objet %s"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "L'algorithme d'empreinte %s n'est pas pris en charge par cette version."
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "MERGE_RR corrompu"
@@ -6558,7 +6638,7 @@
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6593,20 +6673,29 @@
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:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossible de trouver l'arbre de %s"
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2500
+#: revision.c:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: revision.c:2712
+#: revision.c:2870
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
@@ -6629,31 +6718,31 @@
"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
"false`."
-#: send-pack.c:144
+#: send-pack.c:145
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "
"distant"
-#: send-pack.c:146
+#: send-pack.c:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
-#: send-pack.c:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "le dépaquetage a échoué : %s"
-#: send-pack.c:309
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:423
+#: send-pack.c:399
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:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6661,47 +6750,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:413
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:418
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:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de nettoyage invalide de message de validation '%s'"
-#: sequencer.c:296
+#: sequencer.c:297
#, 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:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr "revert"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "action inconnue : %d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6709,7 +6798,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:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6719,44 +6808,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:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:412
+#: sequencer.c:413
#, 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:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: sequencer.c:466
+#: sequencer.c:457
#, 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:461
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:502
+#: sequencer.c:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
@@ -6764,65 +6852,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "aucune clé présente dans '%.*s'"
-#: sequencer.c:757
+#: sequencer.c:748
#, 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:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "variable inconnue '%s'"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' manquant"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' manquant"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' manquant"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6851,11 +6939,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6884,7 +6972,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6910,325 +6998,330 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1257
+#: sequencer.c:1250
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:1252
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, 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:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
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:1346 builtin/am.c:1566 builtin/merge.c:695
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:1379 sequencer.c:1450
#, 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:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "impossible de mettre à jour %s"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, 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:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, 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:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, 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:1797 sequencer.c:1805
#, 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:1811
#, 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:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, 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:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, 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:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr "annulation d'un picorage en cours"
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "annulation d'un retour en cours"
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "un retour est déjà en cours"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "un picorage est déjà en cours"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, 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:2701
#, 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:2716
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
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:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, 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:2830
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:2871
msgid "no revert in progress"
msgstr "Pas de retour en cours ?"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "aucun picorage en cours"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "échec du saut de commit"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "il n'y a rien à sauter"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -7237,21 +7330,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:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7270,22 +7358,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "impossible d'appliquer %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Exécution : %s\n"
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7300,11 +7393,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
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:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7321,103 +7414,129 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:3261
+#: sequencer.c:3279
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:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3437
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:3453
#, 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:3613
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3629
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:3703
+msgid "Cannot autostash"
+msgstr "Autoremisage impossible"
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "réponse de remisage inattendue : '%s'"
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossible de créer le répertoire pour '%s'"
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autoremisage créé : %s\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "impossible de réinitialiser --hard"
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, 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:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"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
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'application du remisage automatique a créé des conflits."
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr "%s n'est pas un OID valide"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "arrêt à HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7438,48 +7557,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebasage (%d/%d)%s"
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebasage et mise à jour de %s avec succès.\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7489,59 +7618,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:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:4338
+#: sequencer.c:4446
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:4342
+#: sequencer.c:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:4849
+#: sequencer.c:4965
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:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:5213
+#: sequencer.c:5336
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 +7680,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 +7691,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 +7709,94 @@
"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:569
#, 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:577
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "erreur à l'ouverture de '%s'"
-#: setup.c:588
+#: setup.c:598
#, 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:600
#, c-format
msgid "error reading %s"
msgstr "erreur à la lecture de %s"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format de fichier git invalide : %s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "aucun chemin dans le fichier git : %s"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "ce n'est pas un dépôt git : %s"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' trop gros"
-#: setup.c:709
+#: setup.c:722
#, 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:751 setup.c:753 setup.c:784
#, 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:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "impossible de revenir au répertoire de travail courant"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "échec du stat de '%*s%s%s'"
-#: setup.c:1108
+#: setup.c:1121
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:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "impossible de modifier en '%s'"
-#: setup.c:1128
+#: setup.c:1141
#, 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:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7678,7 +7807,7 @@
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas défini)."
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7688,272 +7817,272 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: setup.c:1289
+#: setup.c:1304
msgid "open /dev/null or dup failed"
msgstr "échec de l'ouverture ou au dup de /dev/null"
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr "échec de la bifurcation"
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr "échec du setsid"
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-#: sha1-file.c:575
+#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-#: sha1-file.c:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "impossible de normaliser le répertoire d'objet : %s"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "lecture du fichier d'alternatives impossible"
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "impossible de déplacer le nouveau fichier d'alternative"
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "échec de mmap"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "le fichier objet %s est vide"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objet libre corrompu '%s'"
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "données incorrectes à la fin de l'objet libre '%s'"
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "type d'objet invalide"
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"
-#: sha1-file.c:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "impossible de dépaqueter l'entête %s"
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
-#: sha1-file.c:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "impossible d'analyser l'entête %s"
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr "impossible de lire l'objet %s"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "remplacement %s non trouvé pour %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-#: sha1-file.c:1641
+#: sha1-file.c:1652
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-#: sha1-file.c:1746
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr "impossible d'écrire le fichier %s"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossible de régler les droits de '%s'"
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "erreur d'écriture d'un fichier"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "erreur en fermeture du fichier d'objet esseulé"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-#: sha1-file.c:1847
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "impossible d'écrire le fichier d'objet esseulé"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossible de compresser le nouvel objet %s (%d)"
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "échec de deflateEnd sur l'objet %s (%d)"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "données de source d'objet instable pour %s"
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#: sha1-file.c:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr "échec de utime() sur %s"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "impossible de lire l'objet pour %s"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "commit corrompu"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "étiquette corrompue"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "erreur de lecture à l'indexation de %s"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr "lecture tronquée pendant l'indexation de %s"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s : échec de l'insertion dans la base de données"
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "incohérence de hachage pour %s (%s attendu)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "impossible de mmap %s"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossible de dépaqueter l'entête de %s"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "impossible d'analyser l'entête de %s"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossible de dépaqueter le contenu de %s"
@@ -8060,43 +8189,43 @@
msgstr "nom d'objet invalide : '%.*s'."
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u Gio"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, 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:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u Mio"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, 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:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u Kio"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, 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:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8104,18 +8233,44 @@
msgstr[1] "%u octets"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, 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:1180
#, 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 ""
@@ -8180,7 +8335,7 @@
msgid "process for submodule '%s' failed"
msgstr "le processus pour le sous-module '%s' a échoué"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
@@ -8298,41 +8453,15 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2248
+#: submodule.c:2250
#, 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
#, c-format
msgid "running trailer command '%s' failed"
@@ -8387,99 +8516,6 @@
msgid "could not rename temporary file to %s"
msgstr "impossible de renommer un fichier temporaire en %s"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "impossible de lire la liasse '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport : option de profondeur invalide '%s'"
-
-#: transport.c:266
-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
-msgid "server options require protocol version 2 or later"
-msgstr "les options de serveur exigent une version 2 ou supérieure"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "impossible d'analyser la configuration transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "le support du protocole v2 n'est pas encore implanté"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valeur inconnue pour la config '%s' : %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transport '%s' non permis"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync n'est plus supporté"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Les chemins suivants de sous-module contiennent des modifications\n"
-"qui ne peuvent être trouvées sur aucun distant :\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Veuillez essayer\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"ou bien changez de répertoire et utilisez\n"
-"\n"
-"\tgit push\n"
-"\n"
-"pour les pousser vers un serveur distant.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Abandon."
-
-#: transport.c:1201
-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"
@@ -8525,7 +8561,7 @@
msgid "error while running fast-import"
msgstr "erreur au lancement de fast-import"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "impossible de lire la réf %s"
@@ -8545,6 +8581,10 @@
msgid "invalid remote service path"
msgstr "chemin de service distant invalide"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "option non supportée par le protocole"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8585,26 +8625,26 @@
msgid "helper %s does not support 'push-option'"
msgstr "l'assistant %s ne gère pas 'push-option'"
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"l'assistant %s ne gère pas push ; un spécificateur de référence est "
"nécessaire"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'assistant %s ne gère pas 'force'"
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "impossible de lancer fast-export"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "erreur au lancement de fast-export"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8613,50 +8653,139 @@
"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
"Vous devriez peut-être spécifier une branche telle que 'master'.\n"
-#: transport-helper.c:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "réponse malformée dans le liste de réfs : %s"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "échec de read(%s)"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "échec de write(%s)"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "échec du fil d'exécution %s"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "échec de jonction du fil d'exécution %s : %s"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"
-#: transport-helper.c:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "échec du processus %s pour l'attente"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "échec du processus %s"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
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"
+msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "impossible de lire la liasse '%s'"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport : option de profondeur invalide '%s'"
+
+#: transport.c:266
+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
+msgid "server options require protocol version 2 or later"
+msgstr "les options de serveur exigent une version 2 ou supérieure"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "impossible d'analyser la configuration transport.color.*"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "le support du protocole v2 n'est pas encore implanté"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valeur inconnue pour la config '%s' : %s"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport '%s' non permis"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync n'est plus supporté"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Les chemins suivants de sous-module contiennent des modifications\n"
+"qui ne peuvent être trouvées sur aucun distant :\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Veuillez essayer\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou bien changez de répertoire et utilisez\n"
+"\n"
+"\tgit push\n"
+"\n"
+"pour les pousser vers un serveur distant.\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "Abandon."
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "échec de la poussée de tous les sous-modules nécessaires"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "objet arbre trop court"
@@ -8673,7 +8802,7 @@
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 +8813,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 +8823,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 +8833,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 +8843,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 +8852,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 +8861,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 +8871,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 +8881,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 +8890,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 +8900,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 +8909,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 +8919,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 +8928,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 +8939,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 +8949,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 +8959,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 +8968,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 +8978,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 +8987,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 +9001,52 @@
"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 +9056,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:1337
+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,35 +9097,35 @@
msgid "Fetching objects"
msgstr "Récupération des objets"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: worktree.c:305
+#: worktree.c:309
#, 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:320
#, 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:332
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: worktree.c:334
+#: worktree.c:338
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
-#: worktree.c:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' ne pointe pas en retour sur '%s'"
@@ -9040,11 +9177,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 :"
@@ -9149,22 +9286,22 @@
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "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 +9309,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 +9321,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 +9429,144 @@
"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:1692
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9441,32 +9578,32 @@
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1757
+#: wt-status.c:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1759
+#: wt-status.c:1757
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1765
+#: wt-status.c:1763
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, 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:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9475,71 +9612,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:1777
#, 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:1780
#, 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:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1788
+#: wt-status.c:1786
#, 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:1790
#, 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:1903
msgid "No commits yet on "
msgstr "Encore aucun commit sur "
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "différent"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, 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:2474
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:2476
#, 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:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec pour délier '%s'"
@@ -9553,7 +9690,7 @@
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
@@ -9566,7 +9703,7 @@
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:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
@@ -9602,8 +9739,8 @@
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/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "simuler l'action"
@@ -9612,7 +9749,7 @@
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
@@ -9722,7 +9859,7 @@
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
@@ -9744,13 +9881,13 @@
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:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 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:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
@@ -9912,34 +10049,35 @@
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:1699 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:1703
#, 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:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1770
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:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9950,7 +10088,7 @@
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1822
+#: builtin/am.c:1821
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9963,17 +10101,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:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2025
+#: builtin/am.c:2024
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9981,155 +10119,157 @@
"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:2131
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
#, 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:2175
#, 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:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2217
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:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2221
+#: builtin/am.c:2220
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
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:2234
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:2237
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:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr "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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c: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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr "format"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
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:2271
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:2274
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2284
+#: builtin/am.c:2283
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:2287
msgid "show the patch being applied"
msgstr "afficher le patch en cours d'application"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2295
+#: builtin/am.c:2294
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:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -10137,17 +10277,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:2325
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, 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:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10156,13 +10296,13 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2371
+#: builtin/am.c:2370
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:2380
msgid "interactive mode requires patches on the command line"
msgstr "le mode interactif requiert des rustines sur la ligne de commande"
@@ -10578,7 +10718,7 @@
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr "rév"
@@ -10652,14 +10792,14 @@
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "le fichier %s n'a qu'%lu ligne"
msgstr[1] "le fichier %s n'a que %lu lignes"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Assignation de blâme aux lignes"
@@ -10874,7 +11014,7 @@
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "amont"
@@ -10966,68 +11106,68 @@
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:433
+#: builtin/tag.c:434
msgid "object"
msgstr "objet"
-#: builtin/branch.c:658
+#: builtin/branch.c:657
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:682 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:708
+#: builtin/branch.c:706
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:753
+#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:758
+#: builtin/branch.c:756
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:765
+#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:768
+#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:783
+#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:792
+#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:797
+#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr "trop d'arguments pour spécifier une branche amont"
-#: builtin/branch.c:801
+#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11035,32 +11175,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:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:821
+#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:825
+#: builtin/branch.c:823
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:831
+#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:841
+#: builtin/branch.c:839
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11069,7 +11209,7 @@
"branche.\n"
"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:845
+#: builtin/branch.c:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11093,19 +11233,19 @@
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:66 builtin/pack-objects.c:3376
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:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
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:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
@@ -11135,7 +11275,7 @@
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,7 +11283,7 @@
"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]"
@@ -11151,74 +11291,74 @@
"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 "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 git-submodule.sh:984
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 +11387,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:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -11342,7 +11482,7 @@
#: 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/worktree.c:675
msgid "string"
msgstr "chaîne"
@@ -11370,100 +11510,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:256
#, 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:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, 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:395
#, 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:400
#, 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:407
#, 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:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, 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:450
#, 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:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ni '%s', ni '%s' spécifié"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, 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:463 builtin/checkout.c:468
#, 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:527 builtin/checkout.c:534
#, 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:704
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:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11473,50 +11613,50 @@
"suivants :\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, 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:903
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, 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:920 builtin/checkout.c:1344
#, 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:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11539,7 +11679,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11568,19 +11708,19 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
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:1077 builtin/checkout.c:1339
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:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11589,7 +11729,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:1159
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 +11749,51 @@
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1169
#, 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:1235
msgid "only one reference expected"
msgstr "une seule référence attendue"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, 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:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, 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:1358
#, 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:1360
#, 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:1361 builtin/checkout.c:1369
#, 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:1364
#, 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:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11661,7 +11801,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:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11669,7 +11809,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:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11677,7 +11817,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:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11685,7 +11825,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:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11693,144 +11833,146 @@
"impossible de basculer de branche pendant un retour\n"
"Envisagez \"git revert --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1400
msgid "you are switching branch while bisecting"
msgstr "Vous basculez de branche en cours de bissection"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
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:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, 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:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' n'accepte pas <point-de-départ>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, 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:1450
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
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
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:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
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:1510
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
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:1530
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1533
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
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:1592
+#, 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:1596
msgid "-p and --overlay are mutually exclusive"
msgstr "-p et --overlay sont mutuellement exclusifs"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
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:1638
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "nom de branche manquant ; essayez -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr "impossible de résoudre %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, 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:1697
#, 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:1706
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:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file est incompatible avec --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11838,110 +11980,110 @@
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1725
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:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1755
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
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:1758
msgid "use overlay mode (default)"
msgstr "utiliser le mode de superposition (défaut)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
msgid "create and switch to a new branch"
msgstr "créer et basculer sur une nouvelle branche"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1805
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:1807
msgid "second guess 'git switch <no-such-branch>'"
msgstr "interpréter 'git switch <branche-inexistante>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1809
msgid "throw away local modifications"
msgstr "laisser tomber les modifications locales"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
msgstr "de quel <arbre-esque> faire l'extraction"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr "restaurer l'index"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr "restaurer l'arbre de travail (par défaut)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr "ignorer les entrées non-fusionnées"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
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:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -11954,7 +12096,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:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -11981,27 +12123,27 @@
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 +12161,56 @@
"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:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "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
+#: builtin/clean.c:931
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:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12076,7 +12218,7 @@
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12092,7 +12234,7 @@
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr "créer un dépôt nu"
@@ -12112,11 +12254,11 @@
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "spécificateur de chemin"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
@@ -12124,11 +12266,11 @@
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
@@ -12143,7 +12285,7 @@
msgstr "utiliser seulement --reference pour cloner"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr "nom"
@@ -12159,8 +12301,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "profondeur"
@@ -12168,7 +12310,8 @@
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr "heure"
@@ -12176,12 +12319,12 @@
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 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"
@@ -12201,11 +12344,11 @@
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
@@ -12217,23 +12360,23 @@
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
@@ -12266,32 +12409,32 @@
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:431
#, 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:462
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "échec de l'itération sur '%s'"
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "fait.\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"
@@ -12301,102 +12444,102 @@
"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:589
#, 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:708
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "échec lors de l'initialisation l'extraction partielle"
-#: builtin/clone.c:776
+#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
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:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:969
+#: builtin/clone.c:975
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:988
#, 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:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, 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:1010 builtin/fetch.c:1789
#, 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:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1030
#, 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:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, 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:1050
#, 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:1070
#, 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:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12404,41 +12547,41 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
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:1162
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:1164
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:1166
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:1169
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:1174
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, 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:1260
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -12474,6 +12617,96 @@
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+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:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr "git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--[no-]progress] <options de division>"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossible de trouver le répertoire objet correspondant à %s"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr "répertoire"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "Le répertoire d'objet où stocker le graphe"
+
+#: builtin/commit-graph.c:79
+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:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "impossible d'ouvrir le graphe de commit '%s'"
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argument de --split non reconnu, %s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "commencer le parcours à toutes les réfs"
+
+#: builtin/commit-graph.c:157
+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:159
+msgid "start walk at commits listed by stdin"
+msgstr "commencer le parcours aux commits listés sur stdin"
+
+#: builtin/commit-graph.c:161
+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:163
+msgid "enable computation for changed paths"
+msgstr "activer le calcul pour les chemins modifiés"
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
+
+#: builtin/commit-graph.c:170
+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:172
+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:174
+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:190
+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:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID d'objet non hexadécimal inattendu : %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12487,7 +12720,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:547
#, c-format
msgid "not a valid object name %s"
msgstr "nom d'objet invalide %s"
@@ -12515,13 +12748,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:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
msgstr "message"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
msgid "commit message"
msgstr "message de validation"
@@ -12529,8 +12762,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:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
@@ -12577,10 +12810,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 +12839,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,38 +12913,38 @@
"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:1099
#, 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:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c: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
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12718,7 +12959,7 @@
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12733,7 +12974,7 @@
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12743,7 +12984,7 @@
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12754,144 +12995,148 @@
"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:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
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:1189
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
+
+#: builtin/commit.c:1192
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:1202
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:1204
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:1213
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:1231
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:1237
#, 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:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr "calcule les valeurs complètes en avance/en retard"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr "version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
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:1382 builtin/commit.c:1540
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/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
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:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12899,11 +13144,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:1391 parse-options.h:192
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12911,175 +13156,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:1394
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
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:1417
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:1499
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
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:1502
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:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr "date"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
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:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
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:1508
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
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:1510
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:1511
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1513
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
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:1521
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
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:1524
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
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:1528
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
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:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1652
#, 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:1659
#, 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:1664
#, 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:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13089,80 +13334,6 @@
"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>]"
@@ -13492,51 +13663,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 +13711,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 +13720,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,92 +13735,92 @@
"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"
@@ -13891,7 +14057,7 @@
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:1177 builtin/log.c:1724
msgid "refspec"
msgstr "spécificateur de référence"
@@ -13922,107 +14088,108 @@
msgstr ""
"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: 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:117
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:140 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:142 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:144 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:146 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:147
msgid "force overwrite of local reference"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
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:151 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:153
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:155
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:157 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:159
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:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
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:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
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:170 builtin/fetch.c:176 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:172 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:178 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:181
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:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14030,95 +14197,95 @@
"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:188 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:189 builtin/pull.c:226
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 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:197 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
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr "lancer 'gc --auto' après la récupération"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 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:204
msgid "write the commit-graph after fetching"
msgstr "écrire le graphe de commits après le rapatriement"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, 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:752
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
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:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14128,7 +14295,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:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14140,23 +14307,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:914
#, 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:935
#, 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:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14165,56 +14332,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:1128
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, 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:1204
#, 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:1207
#, 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:1415
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:1430
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:1432
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:1434
msgid "unknown branch type"
msgstr "type de branche inconnu"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14222,22 +14389,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:1562 builtin/fetch.c:1625
#, 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:1572 builtin/fetch.c:1627 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:1584
#, 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:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14245,46 +14412,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:1724
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
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:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
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:1782
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:1798
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:1800
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:1809
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1816
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:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14292,29 +14459,29 @@
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
"extensions.partialClone"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <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"
@@ -14354,7 +14521,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:440
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
@@ -14600,7 +14767,7 @@
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:786 builtin/prune.c:134
msgid "show progress"
msgstr "afficher la progression"
@@ -14636,12 +14803,12 @@
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:475 builtin/init-db.c:57
#, 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:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
@@ -14744,266 +14911,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:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, 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:475 builtin/grep.c:600 builtin/grep.c:640
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:724
#, 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:823
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:825
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:827
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:809
+#: builtin/grep.c:829
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
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:845
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr "rechercher dans les sous-répertoires (défaut)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
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:859
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
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:867
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
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:872
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:874
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
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:879
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
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:884
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:885
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
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:889
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:892
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:895
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
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:905
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
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:926
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:908
+#: builtin/grep.c:928
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
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:1003
msgid "no pattern given"
msgstr "aucun motif fourni"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
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:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked non supportée avec --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
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:1084 builtin/pack-objects.c:3548
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:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
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:1147
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:1153
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:1161
msgid "both --cached and trees are given"
msgstr "--cached et des arbres sont fournis en même temps"
@@ -15046,66 +15213,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 +15281,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,35 +15290,35 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:350
+#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:367
+#: builtin/help.c:453
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:375
+#: builtin/help.c:461
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:367
#, 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"
@@ -15189,7 +15356,7 @@
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
@@ -15197,6 +15364,11 @@
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -15255,8 +15427,8 @@
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
@@ -15317,7 +15489,7 @@
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
@@ -15351,169 +15523,178 @@
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1430
#, 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:1438
#, 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:1462
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
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:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, 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:1598
#, 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:1646
#, 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:1653
#, 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:1692
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:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
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:1782
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
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:1836 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:63
#, 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:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "impossible de lire le lien '%s'"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, 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:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "modèle %s ignoré"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, 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:138
#, 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:356
#, 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:359
#, 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:374
+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:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algorithme d'empreinte inconnu '%s'"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s existe déjà"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, 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:459
#, 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:463
#, 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:464
#, 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:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15521,25 +15702,33 @@
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:544
+msgid "hash"
+msgstr "empreinte"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "spécifier l'algorithme d'empreinte à utiliser"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, 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:587
#, 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:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15548,7 +15737,7 @@
"%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:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -15617,128 +15806,128 @@
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:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr "décorer seulement les références correspondant à <motif>"
-#: builtin/log.c:179
+#: builtin/log.c:184
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:185
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:183
+#: builtin/log.c:188
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
-#: builtin/log.c:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, 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:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "impossible de lire l'objet %s"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "type inconnu : %d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, 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:842
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:936
+#: builtin/log.c:957
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:973
#, c-format
msgid "cannot open patch file %s"
msgstr "impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "exactement une plage nécessaire"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "ceci n'est pas une plage"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "la lettre de motivation doit être au format courriel"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
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:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
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:1334
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:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, 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:1455 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "échec à résoudre '%s' comme une référence valide"
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15751,285 +15940,285 @@
"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement"
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr "échec à trouver la base de fusion exacte"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
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:1499
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:1552
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "échec d'inférence d'intervalles de différence d'intervalles"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
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:1653
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
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:1662
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1665
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:1667
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"générer des parties de la lettre d'introduction à partir de la description "
"de la branche"
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
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:1688
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:1690
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:1692
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1698
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:1700
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1682
+#: builtin/log.c:1701
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:1702 builtin/log.c:1705
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1691
+#: builtin/log.c:1710
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:1712
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1696
+#: builtin/log.c:1715
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:1717
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1701
+#: builtin/log.c:1720
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:1722
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:1725
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:1727
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:1812
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr "-n et -k sont mutuellement exclusifs"
-#: builtin/log.c:1809
+#: builtin/log.c:1829
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:1837
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr "Interdiff :"
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contre v%d :"
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiert --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:1993
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:2001
msgid "Range-diff:"
msgstr "Diff-intervalle :"
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr "Diff-intervalle contre v%d :"
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr "Génération des patchs"
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr "échec de création des fichiers en sortie"
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16037,110 +16226,110 @@
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -16158,7 +16347,7 @@
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
msgid "exec"
msgstr "exécutable"
@@ -16235,398 +16424,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 +16444,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 +16535,398 @@
msgid "Merging %s with %s\n"
msgstr "Fusion de %s avec %s\n"
+#: builtin/merge.c:56
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<options>] [<commit>...]"
+
+#: builtin/merge.c:57
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:58
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:121
+msgid "switch `m' requires a value"
+msgstr "le commutateur `m' a besoin d'une valeur"
+
+#: builtin/merge.c:144
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "le commutateur '%s' a besoin d'une valeur"
+
+#: builtin/merge.c:190
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available strategies are:"
+msgstr "Les stratégies disponibles sont :"
+
+#: builtin/merge.c:196
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Les stratégies personnalisées sont :"
+
+#: builtin/merge.c:247 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:250 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:251 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(synonyme de --stat)"
+
+#: builtin/merge.c:253 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:256 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:258 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:260 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "éditer le message avant la validation"
+
+#: builtin/merge.c:262
+msgid "allow fast-forward (default)"
+msgstr "autoriser l'avance rapide (défaut)"
+
+#: builtin/merge.c:264 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:268 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:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
+msgid "strategy"
+msgstr "stratégie"
+
+#: builtin/merge.c:270 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "stratégie de fusion à utiliser"
+
+#: builtin/merge.c:271 builtin/pull.c:172
+msgid "option=value"
+msgstr "option=valeur"
+
+#: builtin/merge.c:272 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "option pour la stratégie de fusion sélectionnée"
+
+#: builtin/merge.c:274
+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:281
+msgid "abort the current in-progress merge"
+msgstr "abandonner la fusion en cours"
+
+#: builtin/merge.c:283
+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:285
+msgid "continue the current in-progress merge"
+msgstr "continuer la fusion en cours"
+
+#: builtin/merge.c:287 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "permettre la fusion d'historiques sans rapport"
+
+#: builtin/merge.c:294
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "impossible de lancer le remisage."
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "échec du remisage"
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr "pas un objet valide : %s"
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr "read-tree a échoué"
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr " (rien à compresser)"
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Validation compressée -- HEAD non mise à jour\n"
+
+#: builtin/merge.c:451
+#, 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:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' ne pointe pas sur un commit"
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
+
+#: builtin/merge.c:716
+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:730
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Options inconnue pour merge-recursive : -X%s"
+
+#: builtin/merge.c:745
+#, c-format
+msgid "unable to write %s"
+msgstr "impossible d'écrire %s"
+
+#: builtin/merge.c:797
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Impossible de lire depuis '%s'"
+
+#: builtin/merge.c:806
+#, 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:812
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\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:817
+msgid "An empty message aborts the commit.\n"
+msgstr "Un message vide abandonne la validation.\n"
+
+#: builtin/merge.c:820
+#, 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:873
+msgid "Empty commit message."
+msgstr "Message de validation vide."
+
+#: builtin/merge.c:888
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Merveilleux.\n"
+
+#: builtin/merge.c:949
+#, 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:988
+msgid "No current branch."
+msgstr "Pas de branche courante."
+
+#: builtin/merge.c:990
+msgid "No remote for the current branch."
+msgstr "Pas de branche distante pour la branche courante."
+
+#: builtin/merge.c:992
+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:997
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Pas de branche de suivi pour %s depuis %s"
+
+#: builtin/merge.c:1054
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
+
+#: builtin/merge.c:1157
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "pas possible de fusionner ceci dans %s : %s"
+
+#: builtin/merge.c:1191
+msgid "not something we can merge"
+msgstr "pas possible de fusionner ceci"
+
+#: builtin/merge.c:1295
+msgid "--abort expects no arguments"
+msgstr "--abort n'accepte pas d'argument"
+
+#: builtin/merge.c:1299
+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:1317
+msgid "--quit expects no arguments"
+msgstr "--quit n'accepte pas d'argument"
+
+#: builtin/merge.c:1330
+msgid "--continue expects no arguments"
+msgstr "--continue ne supporte aucun argument"
+
+#: builtin/merge.c:1334
+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:1350
+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:1357
+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:1360
+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:1374
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
+
+#: builtin/merge.c:1376
+msgid "You cannot combine --squash with --commit."
+msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#: builtin/merge.c:1392
+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:1409
+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:1411
+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:1416
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - pas possible de fusionner ceci"
+
+#: builtin/merge.c:1418
+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:1499
+msgid "refusing to merge unrelated histories"
+msgstr "refus de fusionner des historiques sans relation"
+
+#: builtin/merge.c:1508
+msgid "Already up to date."
+msgstr "Déjà à jour."
+
+#: builtin/merge.c:1518
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Mise à jour %s..%s\n"
+
+#: builtin/merge.c:1564
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Essai de fusion vraiment triviale dans l'index...\n"
+
+#: builtin/merge.c:1571
+#, c-format
+msgid "Nope.\n"
+msgstr "Non.\n"
+
+#: builtin/merge.c:1596
+msgid "Already up to date. Yeeah!"
+msgstr "Déjà à jour. Ouais !"
+
+#: builtin/merge.c:1602
+msgid "Not possible to fast-forward, aborting."
+msgstr "Pas possible d'avancer rapidement, abandon."
+
+#: builtin/merge.c:1630 builtin/merge.c:1695
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Retour de l'arbre à l'original...\n"
+
+#: builtin/merge.c:1634
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Essai de la stratégie de fusion %s...\n"
+
+#: builtin/merge.c:1686
+#, 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:1688
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "La fusion avec la stratégie %s a échoué.\n"
+
+#: builtin/merge.c:1697
+#, 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:1711
+#, 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/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16776,7 +16965,7 @@
"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/prune-packed.c:25
msgid "too many arguments"
msgstr "trop d'arguments"
@@ -16878,7 +17067,7 @@
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
@@ -17071,7 +17260,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:533
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
@@ -17305,7 +17494,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:546
#, 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 +17513,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:164
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
@@ -17340,125 +17529,125 @@
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:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, 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:442
#, c-format
msgid "corrupt packed object for %s"
msgstr "objet empaqueté corrompu pour %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:573
#, 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:784
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objets commandés, %<PRIu32> attendus"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:973
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:986
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 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:1100
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1298
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:1725
#, 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:1734
#, 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:2005
msgid "Counting objects"
msgstr "Décompte des objets"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, 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:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, 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:2223 builtin/pack-objects.c:2250
#, 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:2260
msgid "suboptimal pack - out of memory"
msgstr "paquet sous-optimal - mémoire insuffisante"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, 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:2714
#, 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:2802
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr "inconsistance dans le compte de delta"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17467,7 +17656,7 @@
"ID d'objet de bord attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17476,236 +17665,236 @@
"ID d'objet attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
msgid "invalid value for --missing"
msgstr "valeur invalide pour --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr "impossible d'ouvrir l'index de paquet"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, 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:3168
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr "mauvaise révision '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr "impossible d'ajouter les objets récents"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr "<version>[,<décalage>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
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:3388
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:3390
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:3392
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3396
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:3398
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:3400
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
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:3408
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:3410
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:3412
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:3415
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:3418
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:3421
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:3424
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
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:3428
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
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:3435
msgid "use the sparse reachability algorithm"
msgstr "utiliser l'algorithme de joignabilité creuse"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
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:3441
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:3443
msgid "ignore this pack"
msgstr "ignorer ce paquet"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
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:3451
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:3455
msgid "write a bitmap index if possible"
msgstr "écrire un index de bitmap si possible"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3459
msgid "handling for missing objects"
msgstr "gestion des objets manquants"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
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:3464
msgid "respect islands during delta compression"
msgstr "respecter les îlots pendant la compression des deltas"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3493
#, 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:3498
#, 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:3552
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:3554
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:3559
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:3562
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:3568
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17726,31 +17915,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 +17948,73 @@
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:478 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:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"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:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17808,14 +18022,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:461
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:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17823,7 +18037,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:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17835,44 +18049,44 @@
"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:470 builtin/rebase.c:1234 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
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:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:466
+#: builtin/pull.c:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17882,34 +18096,30 @@
"'%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:610
#, c-format
msgid "unable to access commit %s"
msgstr "impossible d'accéder le commit %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
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:920
+#: builtin/pull.c:955
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:959
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17920,7 +18130,7 @@
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17937,15 +18147,15 @@
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
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:1010
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -18116,12 +18326,12 @@
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
@@ -18151,65 +18361,65 @@
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr "<nom-de-ref>:<attendu>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:556
+#: builtin/push.c:555
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:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:567
+#: builtin/push.c:565
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:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:590
+#: builtin/push.c:587
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:589
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:609
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18231,27 +18441,27 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:630
+#: builtin/push.c:627
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:631
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:636
+#: builtin/push.c:633
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:636
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr ""
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
@@ -18383,7 +18593,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 +18601,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:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "liste à faire inutilisable : '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "impossible de créer un fichier temporaire %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "impossible de marquer comme interactif"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "impossible de générer la liste à-faire"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
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:468
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:481 builtin/rebase.c:1374
+msgid "keep commits which start empty"
+msgstr "conserver les commits qui commencent vides"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 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:487
msgid "rebase merge commits"
msgstr "rebaser les commits de fusion"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr "conserver les points de branchement de cousins originaux"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
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:492
msgid "sign commits"
msgstr "signer les commits"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
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:496
msgid "continue rebase"
msgstr "continuer le rebasage"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "sauter le commit"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "éditer la liste à-faire"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "afficher le patch courant"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
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:506
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:508
msgid "check the todo list"
msgstr "vérifier la liste à-faire"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr "réarranger les lignes fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "insérer les commandes exec dans la liste à-faire"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "sur"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "restreindre la révision"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "écraser-sur"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "écraser sur"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "le commit amont"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "nom du head"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "nom du head"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "stratégie de rebasage"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "options de stratégie"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "options de stratégie"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "switch-to"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
msgstr "la branche ou le commit à extraire"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr "sur-le-nom"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "sur le nom"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "la commande à lancer"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
msgid "automatically re-schedule any `exec` that fails"
msgstr "re-planifier automatiquement tout `exec` qui échoue"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:553
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:569
#, 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
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossible d'accéder 'onto' : '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head invalide : '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, 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:799 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18616,7 +18812,7 @@
"arrêter\n"
"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:882
#, c-format
msgid ""
"\n"
@@ -18635,7 +18831,7 @@
"\n"
"Résultat, git ne peut pas les rebaser."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18644,7 +18840,7 @@
"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
"\"keep\" (garder) et \"ask\" (demander)."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -18661,7 +18857,7 @@
" git rebase '<branche>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18675,136 +18871,136 @@
" git branch --set-upstream-to=%s/<branche> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
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:1276
msgid "empty exec command"
msgstr "commande exec vide"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
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:1307
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:1309
msgid "allow pre-rebase hook to run"
msgstr "permettre le lancement du crochet pre-rebase"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1311
msgid "be quiet. implies --no-stat"
msgstr "être silencieux. implique --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
msgid "do not show diffstat of what changed upstream"
msgstr "ne pas afficher un diffstat de ce qui a changé en amont"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1320
msgid "add a Signed-off-by: line to each commit"
msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr "passé jusqu'à 'git am'"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr "passé jusqu'à git-apply"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
msgid "cherry-pick all commits, even if unchanged"
msgstr "picorer tous les commits, même sans modifiant"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1339
msgid "continue"
msgstr "continuer"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr "sauter le patch courant et continuer"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
msgstr "abandonner et extraire la branche d'origine"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
msgid "abort but keep HEAD where it is"
msgstr "abandonne mais garde HEAD où il est"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1348
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:1351
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:1354
msgid "use apply strategies to rebase"
msgstr "utiliser des stratégies d'application pour rebaser"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr "utiliser des stratégies de fusion pour rebaser"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
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:1366
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:1371
msgid "how to handle commits that become empty"
msgstr "comment gérer les commits qui deviennent vides"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
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:1385
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:1389
msgid "allow rebasing commits with empty messages"
msgstr "autoriser les commits de rebasage avec des messages vides"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
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:1396
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:1398
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:1400 builtin/revert.c:115
msgid "option"
msgstr "option"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
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:1404
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:1409
+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:1426
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18812,40 +19008,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:1432
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:1473
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:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "impossible de combiner '--keep-base' avec '--onto'"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
msgid "cannot combine '--keep-base' with '--root'"
msgstr "impossible de combiner '--keep-base' avec '--root'"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "impossible de combiner '--root' avec '--fork-point'"
+
+#: builtin/rebase.c:1487
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1491
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:1514
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18853,16 +19053,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:1545
msgid "could not discard worktree changes"
msgstr "Impossible de supprimer les changements de l'arbre de travail"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr "Impossible de revenir à %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18884,168 +19084,145 @@
"chose\n"
"d'important ici.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1638
msgid "switch `C' expects a numerical value"
msgstr "l'option `C' attend un valeur numérique"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr "mode inconnu : %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiert --merge ou --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
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:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "backend de rebasage inconnu : %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1794
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:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr "amont invalide '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr "Impossible de créer un nouveau commit racine"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, 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:1853
#, 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:1861
#, 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:1887
#, 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/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
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:1927
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr "Impossible de basculer vers %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr "HEAD est à jour."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, 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:1984
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD est à jour, rebasage forcé."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, 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:1994
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2001
#, c-format
msgid "Changes to %s:\n"
msgstr "Changements vers %s :\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Changements de %s sur %s :\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, 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:2038
msgid "Could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, 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:843
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 +19252,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:863
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 +19272,11 @@
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1960
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -19688,11 +19865,11 @@
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:25
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
-#: 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."
@@ -19701,117 +19878,117 @@
"Utilisez\n"
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
-#: builtin/repack.c:191
+#: builtin/repack.c:193
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:232 builtin/repack.c:418
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:256
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:294
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:294
+#: builtin/repack.c:296
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:299
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:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:310
+#: builtin/repack.c:312
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
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:316
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:316
+#: builtin/repack.c:318
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:319 builtin/repack.c:325
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:318
+#: builtin/repack.c:320
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:322
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:322
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:324
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:326
+#: builtin/repack.c:328
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:330
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:338
+#: builtin/repack.c:340
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:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "Rien de neuf à empaqueter."
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -19830,7 +20007,7 @@
"ALERTE : aussi échoué.\n"
"ALERTE : Veuillez les renommer manuellement dans %s :\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "échec de la suppression de '%s'"
@@ -20142,95 +20319,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/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c: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,12 +20422,12 @@
"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."
@@ -20270,23 +20447,23 @@
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"
@@ -20455,7 +20632,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"
@@ -20490,15 +20668,15 @@
msgid "remote name"
msgstr "nom distant"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "utiliser un protocole RPC sans état"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
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:178
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
@@ -20728,8 +20906,8 @@
"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
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
@@ -20737,63 +20915,51 @@
"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:212
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"échec de la création du répertoire pour le fichier d'extraction partielle"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "échec de paramétrage extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
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:326
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, c-format
msgid "could not normalize path %s"
msgstr "impossible de normaliser le chemin '%s'"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:395
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:420
#, 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:474 builtin/sparse-checkout.c:498
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:543
msgid "read patterns from standard in"
msgstr "lire les motifs depuis l'entrée standard"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "indiquer les motifs de l'extraction partielle"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "désactiver d'extraction partielle"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "erreur lors du rafraîchissement du répertoire de travail"
@@ -20873,7 +21039,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,7 +21048,7 @@
msgid "%s is not a valid reference"
msgstr "%s n'est pas une référence valide"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
@@ -20912,7 +21078,7 @@
msgid "Merging %s with %s"
msgstr "Fusion de %s avec %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
@@ -20935,107 +21101,109 @@
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:633
msgid "The stash entry is kept in case you need it again."
msgstr ""
"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: 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 "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
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:1046
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
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:1173
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:1182
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:1193 builtin/stash.c:1202
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:1230
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:1279
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:1295
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:1310
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, 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:1427
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:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
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:1473 builtin/stash.c:1538
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:1573
+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]"
@@ -21494,18 +21662,26 @@
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:2241 git-submodule.sh:176
#, 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:2257
+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:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, 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:2329
#, 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 +21707,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:486
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr "raison de la mise à jour"
@@ -21630,135 +21806,135 @@
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "forcer l'édition du message d'étiquetage"
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:420
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "l'option --points-at est autorisée seulement en mode liste"
-#: builtin/tag.c:512
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
-#: builtin/tag.c:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -22050,19 +22226,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
@@ -22089,8 +22265,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"
@@ -22156,7 +22331,7 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr "échec de la suppression de '%s'"
@@ -22240,124 +22415,124 @@
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:435 builtin/worktree.c:441
#, 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:437
#, 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:446
#, 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:452
#, 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:493
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:496
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
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:507
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:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
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:676
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:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, 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:690 builtin/worktree.c:723
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:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
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:774
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:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossible de trouver le nom de la destination à partir de '%s'"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr "la cible '%s' existe déjà"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22367,7 +22542,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22375,39 +22550,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:821
#, 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:826
#, 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:874
#, 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:878
#, 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:883
#, 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:906
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:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22417,7 +22592,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22425,7 +22600,7 @@
"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:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
@@ -22447,17 +22622,121 @@
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr "version git ::\n"
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "échec de uname() avec l'erreur '%s' (%d)\n"
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr "info compilateur : "
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr "info libc : "
+
+#: bugreport.c:74
+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"
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]"
+
+#: bugreport.c:91
+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"
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr "spécifier la destination du fichier de rapport de bogue"
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr "spécifier une suffixe au format strftime pour le nom de fichier"
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "impossible de créer les répertoires de premier niveau pour '%s'"
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr "Info système"
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr "Crochets activés"
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "impossible de créer un fichier nouveau à '%s'"
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Nouveau rapport créé à '%s'.\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Champs from manquants pour le sous-module '%s'"
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "champs to manquants pour le sous-module '%s'"
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "commande 'mark' attendue, %s trouvé"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "commande 'to' attendue, %s trouvé"
-#: fast-import.c:3254
+#: fast-import.c:3317
+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"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
@@ -22497,7 +22776,7 @@
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"
@@ -22514,7 +22793,7 @@
" [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
" <commande> [<args>]"
-#: git.c:34
+#: git.c:35
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -22526,47 +22805,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:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "aucun répertoire fourni pour --git-dir\n"
-#: git.c:200
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "aucun espace de nom fournit pour --namespace\n"
-#: git.c:214
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "aucun répertoire fourni pour --work-tree\n"
-#: git.c:228
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "aucun préfixe fourni pour --super-prefix\n"
-#: git.c:250
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c requiert une chaîne de configuration\n"
-#: git.c:288
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr "aucun répertoire fourni pour -C\n"
-#: git.c:314
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr "option inconnue : %s\n"
-#: git.c:360
+#: git.c:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "lors de l'expansion de l'alias '%s' : '%s'"
-#: git.c:369
+#: git.c:371
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22575,39 +22854,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:378
#, c-format
msgid "empty alias for %s"
msgstr "alias vide pour %s"
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr "alias recursif : %s"
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr "échec d'écriture sur la sortie standard"
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr "échec inconnu d'écriture sur la sortie standard"
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr "échec de fermeture de la sortie standard"
-#: git.c:793
+#: git.c:792
#, 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:842
#, 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:855
#, c-format
msgid ""
"usage: %s\n"
@@ -22616,57 +22895,57 @@
"usage : %s\n"
"\n"
-#: git.c:876
+#: git.c:875
#, 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:887
#, 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:914
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:993
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:1139
#, 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:1146
#, 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:1150
#, 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:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22788,6 +23067,14 @@
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl : commande inconnue '%s' depuis git"
+#: 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:85
msgid "args"
msgstr "args"
@@ -22844,11 +23131,11 @@
msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
@@ -22891,642 +23178,646 @@
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 "Prepare patches for e-mail submission"
msgstr "Préparer les patchs pour soumission par courriel"
-#: command-list.h:99
+#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
"Vérifier la connectivité et la validité des objets dans la base de données"
-#: command-list.h:100
+#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local"
-#: command-list.h:101
+#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Extraire l'ID du commit depuis une archive créée par git-archive"
-#: command-list.h:102
+#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "Afficher les lignes correspondant à un motif"
-#: command-list.h:103
+#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "Une interface graphique portable pour Git"
-#: command-list.h:104
+#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier"
-#: command-list.h:105
+#: command-list.h:106
msgid "Display help information about Git"
msgstr "Afficher l'information d'aide à propos de Git"
-#: command-list.h:106
+#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "Implantation côté serveur de Git sur HTTP"
-#: command-list.h:107
+#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "Télécharger depuis un dépôt Git distant via HTTP"
-#: command-list.h:108
+#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV"
-#: command-list.h:109
-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"
-
#: command-list.h:110
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP"
+
+#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr ""
"Construire un fichier d'index pack depuis une archive compactée existante"
-#: command-list.h:111
+#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Créer un dépôt Git vide ou réinitialiser un existant"
-#: command-list.h:112
+#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
-#: command-list.h:113
+#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr ""
"Ajouter ou analyser l'information structurée dans les messages de validation"
-#: command-list.h:114
+#: command-list.h:115
msgid "The Git repository browser"
msgstr "Le navigateur de dépôt Git"
-#: command-list.h:115
+#: command-list.h:116
msgid "Show commit logs"
msgstr "Afficher l'historique des validations"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr ""
"Afficher l'information à propos des fichiers dans l'index ou l'arbre de "
"travail"
-#: command-list.h:117
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Lister les références dans un dépôt distant"
-#: command-list.h:118
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Afficher le contenu d'un objet arbre"
-#: command-list.h:119
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
"Extraire le patch et l'information de d'auteur depuis un simple message de "
"courriel"
-#: command-list.h:120
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Programme simple de découpage de mbox UNIX"
-#: command-list.h:121
+#: command-list.h:122
msgid "Join two or more development histories together"
msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
-#: command-list.h:122
+#: command-list.h:123
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:124
msgid "Run a three-way file merge"
msgstr "Lancer une fusion à 3 points"
-#: command-list.h:124
+#: command-list.h:125
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:126
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:127
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:128
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:129
msgid "Write and verify multi-pack-indexes"
msgstr "Écrire et vérifier les index multi-paquet"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "Créer un objet étiquette"
-#: command-list.h:130
+#: command-list.h:131
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:132
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:133
msgid "Find symbolic names for given revs"
msgstr "Trouver les noms symboliques pour des révisions données"
-#: command-list.h:133
-msgid "Add or inspect object notes"
-msgstr "Ajouter ou inspecter les notes d'un objets"
-
#: command-list.h:134
+msgid "Add or inspect object notes"
+msgstr "Ajouter ou inspecter les notes d'un objet"
+
+#: command-list.h:135
msgid "Import from and submit to Perforce repositories"
msgstr "Importer et soumettre à des dépôt Perforce"
-#: command-list.h:135
+#: command-list.h:136
msgid "Create a packed archive of objects"
msgstr "Créer une archive compactée d'objets"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "Trouver les fichiers pack redondants"
-#: command-list.h:137
+#: command-list.h:138
msgid "Pack heads and tags for efficient repository access"
msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt"
-#: command-list.h:138
+#: command-list.h:139
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:140
msgid "Compute unique ID for a patch"
msgstr "Calculer l'ID unique d'un patch"
-#: command-list.h:140
+#: command-list.h:141
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:142
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:143
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:144
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:145
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:146
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:147
msgid "Reads tree information into the index"
msgstr "Lire l'information d'arbre dans l'index"
-#: command-list.h:147
+#: command-list.h:148
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:149
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:150
msgid "Manage reflog information"
msgstr "Gérer l'information de reflog"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Gérer un ensemble de dépôts suivis"
-#: command-list.h:151
+#: command-list.h:152
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:153
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:154
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:155
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:156
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:157
msgid "Restore working tree files"
msgstr "restaurer les fichiers l'arbre de travail"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "Inverser des commits existants"
-#: command-list.h:158
+#: command-list.h:159
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:160
msgid "Pick out and massage parameters"
msgstr "Analyser et préparer les paramètres"
-#: command-list.h:160
+#: command-list.h:161
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:162
msgid "Send a collection of patches as emails"
msgstr "Envoyer un ensemble de patchs comme courriels"
-#: command-list.h:162
+#: command-list.h:163
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:164
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:165
msgid "Summarize 'git log' output"
msgstr "Résumer la sortie de 'git log'"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "Afficher différents types d'objets"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "Afficher les branches et leurs commits"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "Afficher l'index de l'archive empaquetée"
-#: command-list.h:168
+#: command-list.h:169
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:170
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:171
msgid "Common Git shell script setup code"
msgstr "Le code d'initialisation commun aux scripts shell Git"
-#: command-list.h:171
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Initialiser et modifier l'extraction partielle"
-#: command-list.h:172
+#: command-list.h:173
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:174
msgid "Add file contents to the staging area"
msgstr "Ajouter le contenu de fichiers à l'index"
-#: command-list.h:174
+#: command-list.h:175
msgid "Show the working tree status"
msgstr "Afficher l'état de la copie de travail"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Retirer les espaces inutiles"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
-#: command-list.h:177
-msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git"
-
#: command-list.h:178
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git"
+
+#: command-list.h:179
msgid "Switch branches"
msgstr "Basculer de branche"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Lire, modifier et supprimer les références symboliques"
-#: command-list.h:180
+#: command-list.h:181
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:182
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:183
msgid "Unpack objects from a packed archive"
msgstr "Dépaqueter les objets depuis une archive empaquetée"
-#: command-list.h:183
+#: command-list.h:184
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:185
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:186
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:187
msgid "Send archive back to git-archive"
msgstr "Renvoyer une archive dans git-archive"
-#: command-list.h:187
+#: command-list.h:188
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:189
msgid "Show a Git logical variable"
msgstr "Afficher un variable logique de Git"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Vérifier la signature GPG de commits"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Valider des fichiers d'archive Git empaquetés"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Vérifier la signature GPG d'étiquettes"
-#: command-list.h:192
+#: command-list.h:193
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interface web de Git"
-#: command-list.h:193
+#: command-list.h:194
msgid "Show logs with difference each commit introduces"
msgstr "Afficher les journaux avec la différence que chaque commit introduit"
-#: command-list.h:194
-msgid "Manage multiple working trees"
-msgstr "Gère de arbres de travail multiples"
-
#: command-list.h:195
+msgid "Manage multiple working trees"
+msgstr "Gérer des arbres de travail multiples"
+
+#: command-list.h:196
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:197
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "interface en ligne de commande et conventions de Git"
-#: command-list.h:198
+#: command-list.h:199
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:200
msgid "Git for CVS users"
msgstr "Git pour les utilisateurs de CVS"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Bidouillage de la sortie diff"
-#: command-list.h:201
+#: command-list.h:202
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:203
msgid "A Git Glossary"
msgstr "Un glossaire Git"
-#: command-list.h:203
+#: command-list.h:204
msgid "Hooks used by Git"
msgstr "Crochets utilisés par Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: command-list.h:205
+#: command-list.h:206
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: command-list.h:206
+#: command-list.h:207
msgid "Git namespaces"
msgstr "Espaces de nom de Git"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git Repository Layout"
msgstr "Disposition d'un dépôt Git"
-#: command-list.h:208
+#: command-list.h:209
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:210
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:211
msgid "A tutorial introduction to Git: part two"
msgstr "Une introduction pratique à Git : deuxième partie"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git"
msgstr "Une introduction pratique à Git"
-#: command-list.h:212
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
@@ -23570,20 +23861,20 @@
msgid "cannot read $file for replaying"
msgstr "impossible de lire $file pour rejouer"
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr "?? de quoi parlez-vous ?"
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr "la bissection a échoué : aucune commande fournie."
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr "lancement de $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23592,11 +23883,11 @@
"la bissection a échoué :\n"
"le code retour $res de '$command' est < 0 ou >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr "la bissection ne peut plus continuer"
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23605,11 +23896,11 @@
"la bissection a échoué :\n"
"'bisect_state $state' a retourné le code erreur $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr "succès de la bissection"
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr "Pas de bissection en cours."
@@ -23653,133 +23944,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:205
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:215
#, 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:234
#, 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:237
#, 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:244
#, 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:275
#, 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:277
#, 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:285
#, 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:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23796,39 +24004,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:293
#, 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:305
#, 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:310
#, 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:319
#, 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:592
#, 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:602
#, 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:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23837,7 +24045,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:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23846,7 +24054,7 @@
"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
"de rapatriement direct de $sha1 :"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23855,76 +24063,76 @@
"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:638
#, 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:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, 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:644
#, 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:649
#, 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:650
#, 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:655
#, 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:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:896
+#: git-submodule.sh:878
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:948
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:971
+#: git-submodule.sh:953
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:974
+#: git-submodule.sh:956
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -23945,6 +24153,16 @@
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)"
diff --git a/po/git.pot b/po/git.pot
index 7dd2e2b..000e95e 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: 2020-05-15 09:11+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"
@@ -23,9 +23,9 @@
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:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
msgid "could not read index"
msgstr ""
@@ -53,8 +53,7 @@
msgid "could not stage '%s'"
msgstr ""
-#: 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:3336
msgid "could not write index"
msgstr ""
@@ -70,8 +69,8 @@
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:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
@@ -194,11 +193,11 @@
msgid "(empty) select nothing"
msgstr ""
-#: 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:1851
msgid "*** Commands ***"
msgstr ""
-#: 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:1848
msgid "What now"
msgstr ""
@@ -210,12 +209,13 @@
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
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr ""
@@ -223,33 +223,33 @@
msgid "could not refresh index"
msgstr ""
-#: 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:1765
#, c-format
msgid "Bye.\n"
msgstr ""
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-#: add-patch.c:40
+#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -258,28 +258,28 @@
"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:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -288,28 +288,28 @@
"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:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-#: add-patch.c:84
+#: add-patch.c:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -318,28 +318,28 @@
"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:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr ""
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -348,31 +348,31 @@
"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
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
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:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -381,22 +381,22 @@
"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:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -405,22 +405,22 @@
"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:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -429,7 +429,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:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -438,47 +438,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:319
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr ""
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:338 add-patch.c:342
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr ""
-#: add-patch.c:395
+#: add-patch.c:396
msgid "could not parse diff"
msgstr ""
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr ""
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr ""
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr ""
-#: add-patch.c:588
+#: add-patch.c:589
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:762
#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
msgstr ""
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -487,11 +487,11 @@
"%.*s"
msgstr ""
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -501,18 +501,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:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: add-patch.c:1103
+#: add-patch.c:1104
msgid "could not parse hunk header"
msgstr ""
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr ""
@@ -624,59 +624,66 @@
msgid "'git apply' failed"
msgstr ""
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:168
+#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:178
+#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: 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."
msgstr ""
-#: advice.c:194
+#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:278 builtin/merge.c:1353
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:201
+#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -936,7 +943,7 @@
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:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr ""
@@ -1131,7 +1138,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr ""
@@ -1197,7 +1204,7 @@
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4973 builtin/am.c:2259
msgid "num"
msgstr ""
@@ -1253,7 +1260,7 @@
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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr ""
@@ -1261,9 +1268,9 @@
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
msgid "action"
msgstr ""
@@ -1292,8 +1299,8 @@
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
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
@@ -1305,7 +1312,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5032 builtin/am.c:2247
msgid "root"
msgstr ""
@@ -1313,140 +1320,6 @@
msgid "prepend <root> to all filenames"
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: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"
@@ -1486,7 +1359,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
#, c-format
msgid "deflate error (%d)"
msgstr ""
@@ -1496,6 +1369,140 @@
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:377 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:401
+#, c-format
+msgid "no such ref: %.*s"
+msgstr ""
+
+#: archive.c:407
+#, c-format
+msgid "not a valid object name: %s"
+msgstr ""
+
+#: archive.c:420
+#, c-format
+msgid "not a tree object: %s"
+msgstr ""
+
+#: archive.c:432
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:464
+msgid "fmt"
+msgstr ""
+
+#: archive.c:464
+msgid "archive format"
+msgstr ""
+
+#: archive.c:465 builtin/log.c:1674
+msgid "prefix"
+msgstr ""
+
+#: archive.c:466
+msgid "prepend prefix to each pathname in the archive"
+msgstr ""
+
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr ""
+
+#: archive.c:468 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr ""
+
+#: archive.c:470
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:471
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:472
+msgid "store only"
+msgstr ""
+
+#: archive.c:473
+msgid "compress faster"
+msgstr ""
+
+#: archive.c:481
+msgid "compress better"
+msgstr ""
+
+#: archive.c:484
+msgid "list supported archive formats"
+msgstr ""
+
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr ""
+
+#: archive.c:487 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr ""
+
+#: archive.c:489 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
+#: archive.c:496
+msgid "Unexpected option --remote"
+msgstr ""
+
+#: archive.c:498
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
+
+#: archive.c:500
+msgid "Unexpected option --output"
+msgstr ""
+
+#: archive.c:522
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr ""
+
+#: archive.c:529
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1574,12 +1581,12 @@
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr ""
@@ -1617,37 +1624,37 @@
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
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
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,12 +1773,12 @@
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 ""
@@ -1786,8 +1793,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -1839,7 +1846,7 @@
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:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -1862,18 +1869,285 @@
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:183
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c:248
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:255
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:262
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:284
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+
+#: commit-graph.c:294
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr ""
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:436
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:446
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:494
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:518
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:651 commit-graph.c:711
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:672
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:948 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr ""
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr ""
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:1196
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1213
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1233
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:1252
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1359
+#, 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:1372
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:1376
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:1405
+#, 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:1426
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr ""
+
+#: commit-graph.c:1442
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:1457
+msgid "Counting distinct commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1489
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:1538
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1572 midx.c:812
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1585
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1590
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: commit-graph.c:1667
+#, 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:1712
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1728
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1748
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1874
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:1885
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr ""
+
+#: commit-graph.c:1908
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2096
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:2107
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:2200
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:2210
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c:2220 commit-graph.c:2235
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:2227
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c:2245
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2259
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2266
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2276
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2285
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2298
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2303
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2307
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2322
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+
+#: commit-graph.c:2328
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr ""
-#: 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 +2159,38 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1153
+#: commit.c:1168
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1157
+#: commit.c:1172
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1160
+#: commit.c:1175
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1163
+#: commit.c:1178
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1417
+#: commit.c:1432
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:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2177,289 +2200,289 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr ""
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:382
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:406 sequencer.c:2444
+#: config.c:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:833
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:837
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr ""
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr ""
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:998
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:1001
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:1004
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:1007
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:1010
+#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:1013
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1117
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1208
+#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3542
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2097
+#: config.c:2113
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2267
+#: config.c:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2312
+#: config.c:2328
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2358
+#: config.c:2374
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2360
+#: config.c:2376
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2441
+#: config.c:2457
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2502
+#: config.c:2518
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2754 config.c:3078
+#: config.c:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2977
+#: config.c:2993
#, 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:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -2615,19 +2638,19 @@
msgid "unable to fork"
msgstr ""
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
msgid "Checking connectivity"
msgstr ""
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr ""
@@ -2719,35 +2742,63 @@
msgid "external filter '%s' failed"
msgstr ""
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr ""
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr ""
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-#: convert.c:1223
+#: convert.c:1243
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1411 convert.c:1445
+#: convert.c:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1489
+#: convert.c:1511
#, 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:396
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#: credential.c:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr ""
+
+#: credential.c:513
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr ""
+
#: date.c:138
msgid "in the future"
msgstr ""
@@ -2840,15 +2891,6 @@
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr ""
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr ""
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr ""
@@ -2900,528 +2942,537 @@
"%s"
msgstr ""
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4547
+#: diff.c:4583
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4550
+#: diff.c:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4676
+#: diff.c:4712
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4798
+#: diff.c:4834
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4822
+#: diff.c:4858
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4836
+#: diff.c:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5178
+#: diff.c:5214
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5234
+#: diff.c:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr ""
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr ""
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr ""
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr ""
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5287
+#: diff.c:5323
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5289 diff.c:5297
+#: diff.c:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5290
+#: diff.c:5326
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5294
+#: diff.c:5330
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5302
+#: diff.c:5338
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5305
+#: diff.c:5341
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5308
+#: diff.c:5344
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5311
+#: diff.c:5347
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5313
+#: diff.c:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr ""
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr ""
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr ""
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5335
+#: diff.c:5371
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5337
+#: diff.c:5373
msgid "show colored diff"
msgstr ""
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr ""
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5342
+#: diff.c:5378
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:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr ""
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5352
+#: diff.c:5388
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5355
+#: diff.c:5391
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5358
+#: diff.c:5394
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:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr ""
-#: diff.c:5363
+#: diff.c:5399
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5368
+#: diff.c:5404
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5373
+#: diff.c:5409
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5376
+#: diff.c:5412
msgid "Diff rename options"
msgstr ""
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5378
+#: diff.c:5414
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5382
+#: diff.c:5418
msgid "detect renames"
msgstr ""
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr ""
-#: diff.c:5393
+#: diff.c:5429
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5395
+#: diff.c:5431
msgid "disable rename detection"
msgstr ""
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5400
+#: diff.c:5436
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5403
+#: diff.c:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5405
+#: diff.c:5441
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5425
+#: diff.c:5461
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5428
+#: diff.c:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr ""
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr ""
-#: diff.c:5438
+#: diff.c:5474
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr ""
-#: diff.c:5441
+#: diff.c:5477
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr ""
-#: diff.c:5444
+#: diff.c:5480
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5447
+#: diff.c:5483
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5450
+#: diff.c:5486
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5453
+#: diff.c:5489
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5456
+#: diff.c:5492
msgid "Other diff options"
msgstr ""
-#: diff.c:5458
+#: diff.c:5494
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5462
+#: diff.c:5498
msgid "treat all files as text"
msgstr ""
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5466
+#: diff.c:5502
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5468
+#: diff.c:5504
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5470
+#: diff.c:5506
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5472
+#: diff.c:5508
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5474
+#: diff.c:5510
msgid "<when>"
msgstr ""
-#: diff.c:5475
+#: diff.c:5511
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5478
+#: diff.c:5514
msgid "<format>"
msgstr ""
-#: diff.c:5479
+#: diff.c:5515
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5483
+#: diff.c:5519
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5486
+#: diff.c:5522
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5488
+#: diff.c:5524
msgid "<string>"
msgstr ""
-#: diff.c:5489
+#: diff.c:5525
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5492
+#: diff.c:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5495
+#: diff.c:5531
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5498
+#: diff.c:5534
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5501
+#: diff.c:5537
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5502
+#: diff.c:5538
msgid "<object-id>"
msgstr ""
-#: diff.c:5503
+#: diff.c:5539
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5505
+#: diff.c:5541
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5506
+#: diff.c:5542
msgid "select files by diff type"
msgstr ""
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr ""
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6164
+#: diff.c:6200
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6167
+#: diff.c:6203
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6170
+#: diff.c:6206
#, 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:592
+msgid "Performing inexact rename detection"
+msgstr ""
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3451,35 +3502,35 @@
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2603
+#: dir.c:2699
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3407
+#: dir.c:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3486
+#: dir.c:3560
#, 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 ""
@@ -3488,17 +3539,17 @@
msgid "Filtering content"
msgstr ""
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr ""
@@ -3508,244 +3559,244 @@
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:150
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:153
+#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:164
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:195
+#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:257
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:357 fetch-pack.c:1364
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:363 fetch-pack.c:1370
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr ""
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:340
msgid "done"
msgstr ""
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:818
+#: fetch-pack.c:819
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:826
+#: fetch-pack.c:827
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:916
+#: fetch-pack.c:917
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, 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:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 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:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1263
+#: fetch-pack.c:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1320
+#: fetch-pack.c:1344
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1362
+#: fetch-pack.c:1386
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1409
+#: fetch-pack.c:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1762
+#: fetch-pack.c:1789
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1812
+#: fetch-pack.c:1839
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, 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:272
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr ""
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -3762,7 +3813,7 @@
msgid "'%s': unable to read %s"
msgstr ""
-#: 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:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -3838,7 +3889,7 @@
msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:363 git.c:98
+#: help.c:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr ""
@@ -3847,50 +3898,50 @@
msgid "The common Git guides are:"
msgstr ""
-#: help.c:512
+#: help.c:427
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: help.c:517
+#: help.c:432
msgid "External commands"
msgstr ""
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr ""
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:655
+#: help.c:570
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:677
+#: help.c:592
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: help.c:682
+#: help.c:597
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: help.c:687
+#: help.c:602
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: help.c:695
+#: help.c:610
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:699
+#: help.c:614
msgid ""
"\n"
"The most similar command is"
@@ -3900,16 +3951,16 @@
msgstr[0] ""
msgstr[1] ""
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr ""
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -3962,36 +4013,11 @@
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:436 builtin/commit.c:634
#, c-format
msgid "invalid date format: %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 ""
-
-#: 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 ""
@@ -4018,7 +4044,32 @@
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: lockfile.c:151
+#: 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"
@@ -4030,19 +4081,13 @@
"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"
-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:109
+msgid "expected flush after ls-refs arguments"
msgstr ""
#: merge-recursive.c:356
@@ -4321,7 +4366,7 @@
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3089 git-submodule.sh:1003
+#: merge-recursive.c:3089 git-submodule.sh:985
msgid "submodule"
msgstr ""
@@ -4427,10 +4472,20 @@
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr ""
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr ""
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr ""
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4480,107 +4535,115 @@
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:210
+#: midx.c:208
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:260
+#: midx.c:258
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr ""
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr ""
-#: midx.c:1052
+#: midx.c:1056
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1108
+#: midx.c:1112
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1123
+#: midx.c:1127
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1128
+#: midx.c:1132
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1141
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1137
+#: midx.c:1150
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1157
+#: midx.c:1170
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1180
+#: midx.c:1193
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1186
+#: midx.c:1199
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1195
+#: midx.c:1208
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1220
+#: midx.c:1233
msgid "Counting referenced objects"
msgstr ""
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr ""
@@ -4660,6 +4723,11 @@
msgid "hash mismatch %s"
msgstr ""
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
@@ -4674,9 +4742,24 @@
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:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
msgstr ""
#: parse-options.c:38
@@ -4719,26 +4802,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:857
+#: parse-options.c:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr ""
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:861
+#: parse-options.c:858
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:885
+#: parse-options.c:882
msgid "..."
msgstr ""
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr ""
@@ -4746,45 +4834,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:952
+#: parse-options.c:949
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 +4904,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 ""
@@ -4926,7 +4989,7 @@
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr ""
@@ -4939,29 +5002,40 @@
msgid "promisor remote name cannot begin with '/': %s"
msgstr ""
-#: range-diff.c:75
-msgid "could not start `log`"
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
msgstr ""
#: range-diff.c:77
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: 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 ""
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
-#: range-diff.c:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr ""
-#: 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 ""
@@ -5073,9 +5147,9 @@
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr ""
@@ -5130,12 +5204,12 @@
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:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr ""
@@ -5230,14 +5304,14 @@
"\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:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, 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:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr ""
@@ -5260,132 +5334,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:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, 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:1936
msgid "gone"
msgstr ""
@@ -5570,114 +5526,232 @@
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr ""
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr ""
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr ""
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr ""
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:2004
+#: ref-filter.c:2001
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2389
+#: ref-filter.c:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: ref-filter.c:2502
+#: ref-filter.c:2508
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: remote.c:366
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr ""
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr ""
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr ""
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr ""
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr ""
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr ""
+
+#: refs.c:954
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:960
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1111
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2113 refs.c:2148
+#, 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 ""
+
+#: remote.c:355
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: remote.c:414
+#: remote.c:403
msgid "more than one receivepack given, using the first"
msgstr ""
-#: remote.c:422
+#: remote.c:411
msgid "more than one uploadpack given, using the first"
msgstr ""
-#: remote.c:612
+#: remote.c:594
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:616
+#: remote.c:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1004
+#: remote.c:986
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
-#: remote.c:1009
+#: remote.c:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -5686,7 +5760,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -5700,7 +5774,7 @@
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -5708,7 +5782,7 @@
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -5716,7 +5790,7 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -5724,7 +5798,7 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -5732,114 +5806,114 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr ""
-#: remote.c:1106
+#: remote.c:1088
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: remote.c:1118
+#: remote.c:1100
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1125
+#: remote.c:1107
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1628 remote.c:1729
+#: remote.c:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1646
+#: remote.c:1628
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1661
+#: remote.c:1643
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1673
+#: remote.c:1655
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1683
+#: remote.c:1665
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1696
+#: remote.c:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2020
+#: remote.c:2002
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2024
+#: remote.c:2006
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2027
+#: remote.c:2009
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2031
+#: remote.c:2013
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:2034
+#: remote.c:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2044
+#: remote.c:2026
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2047
+#: remote.c:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -5847,11 +5921,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2055
+#: remote.c:2037
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2058
+#: remote.c:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -5862,11 +5936,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2068
+#: remote.c:2050
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: remote.c:2251
+#: remote.c:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
@@ -5886,6 +5960,11 @@
msgid "replace depth too high for object %s"
msgstr ""
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr ""
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr ""
@@ -5944,7 +6023,7 @@
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -5979,20 +6058,29 @@
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:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2500
+#: revision.c:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: revision.c:2712
+#: revision.c:2870
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
@@ -6012,125 +6100,124 @@
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:144
+#: send-pack.c:145
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: send-pack.c:146
+#: send-pack.c:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:309
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:423
+#: send-pack.c:399
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:425
+#: send-pack.c:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:437
+#: send-pack.c:413
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:442
+#: send-pack.c:418
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:296
+#: sequencer.c:297
#, 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:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr ""
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr ""
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr ""
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:392
+#: sequencer.c:393
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:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:412
+#: sequencer.c:413
#, 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:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:466
+#: sequencer.c:457
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:470
+#: sequencer.c:461
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:502
+#: sequencer.c:493
#, c-format
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
@@ -6138,65 +6225,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:757
+#: sequencer.c:748
#, 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:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6213,11 +6300,11 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6232,7 +6319,7 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6246,345 +6333,345 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1286
+#: sequencer.c:1279
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1379 sequencer.c:1450
#, 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:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1479
+#: sequencer.c:1486
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1655
-#, c-format
-msgid "could not read commit message of %s"
-msgstr ""
-
#: sequencer.c:1662
#, c-format
+msgid "could not read commit message of %s"
+msgstr ""
+
+#: sequencer.c:1669
+#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1782
+#: sequencer.c:1789
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1804
+#: sequencer.c:1811
#, 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:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1961
+#: sequencer.c:1972
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2018
+#: sequencer.c:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:2667
+#: sequencer.c:2687
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2681
+#: sequencer.c:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2799
+#: sequencer.c:2819
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2810
+#: sequencer.c:2830
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2851
+#: sequencer.c:2871
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:2879
+#: sequencer.c:2899
#, 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:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -6596,22 +6683,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3084
+#: sequencer.c:3102
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -6621,11 +6713,11 @@
"\n"
msgstr ""
-#: sequencer.c:3135
+#: sequencer.c:3153
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3141
+#: sequencer.c:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -6636,99 +6728,125 @@
"\n"
msgstr ""
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3261
+#: sequencer.c:3279
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:3363
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3418
+#: sequencer.c:3437
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3434
+#: sequencer.c:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:3594
+#: sequencer.c:3613
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3610
+#: sequencer.c:3629
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3703
+msgid "Cannot autostash"
+msgstr ""
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3691
+#: sequencer.c:3756
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:3755
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr ""
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr ""
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -6741,114 +6859,124 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4127
+#: sequencer.c:4234
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:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4338
+#: sequencer.c:4446
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4342
+#: sequencer.c:4450
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5213
+#: sequencer.c:5336
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 +6984,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,367 +6997,367 @@
"'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:569
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:567
+#: setup.c:577
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:586
-#, c-format
-msgid "error opening '%s'"
-msgstr ""
-
-#: setup.c:588
-#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr ""
-
-#: setup.c:590
-#, c-format
-msgid "error reading %s"
-msgstr ""
-
-#: setup.c:592
-#, c-format
-msgid "invalid gitfile format: %s"
-msgstr ""
-
-#: setup.c:594
-#, c-format
-msgid "no path in gitfile: %s"
-msgstr ""
-
#: setup.c:596
#, c-format
+msgid "error opening '%s'"
+msgstr ""
+
+#: setup.c:598
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ""
+
+#: setup.c:600
+#, c-format
+msgid "error reading %s"
+msgstr ""
+
+#: setup.c:602
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr ""
+
+#: setup.c:604
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr ""
+
+#: setup.c:606
+#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:709
+#: setup.c:722
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:751 setup.c:753 setup.c:784
#, 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:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1128
+#: setup.c:1141
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1134
+#: setup.c:1147
#, 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:1258
#, 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:1304
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr ""
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr ""
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: sha1-file.c:575
+#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr ""
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr ""
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr ""
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr ""
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1641
+#: sha1-file.c:1652
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1746
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr ""
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr ""
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1847
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr ""
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr ""
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#: sha1-file.c:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr ""
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr ""
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr ""
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
@@ -7317,43 +7445,43 @@
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:847
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:856
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:864
+#: strbuf.c:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7361,18 +7489,42 @@
msgstr[1] ""
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1164
+#: strbuf.c:1180
#, 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 ""
@@ -7430,7 +7582,7 @@
msgid "process for submodule '%s' failed"
msgstr ""
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
@@ -7539,39 +7691,15 @@
"'%s'\n"
msgstr ""
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2248
+#: submodule.c:2250
#, 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
#, c-format
msgid "running trailer command '%s' failed"
@@ -7626,86 +7754,6 @@
msgid "could not rename temporary file to %s"
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:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr ""
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr ""
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr ""
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr ""
-
#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr ""
@@ -7748,7 +7796,7 @@
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr ""
@@ -7766,6 +7814,10 @@
msgid "invalid remote service path"
msgstr ""
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr ""
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -7806,74 +7858,150 @@
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: transport-helper.c:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
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:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr ""
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+
+#: transport.c:1056
+#, 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:1064
+msgid "Aborting."
+msgstr ""
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr ""
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr ""
@@ -7890,98 +8018,98 @@
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 +8117,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 +8125,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:1337
+msgid "expected flush after fetch arguments"
+msgstr ""
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
@@ -8113,32 +8252,32 @@
msgid "Fetching objects"
msgstr ""
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:305
+#: worktree.c:309
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:316
+#: worktree.c:320
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:328
+#: worktree.c:332
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:334
+#: worktree.c:338
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
@@ -8186,11 +8325,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 ""
@@ -8288,28 +8427,28 @@
msgid "untracked content, "
msgstr ""
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
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 +8456,242 @@
"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:1692
msgid "On branch "
msgstr ""
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8560,97 +8699,97 @@
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1757
+#: wt-status.c:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1759
+#: wt-status.c:1757
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1765
+#: wt-status.c:1763
msgid "No changes"
msgstr ""
-#: wt-status.c:1770
+#: wt-status.c:1768
#, 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:1771
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1776
+#: wt-status.c:1774
#, 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:1777
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1782
+#: wt-status.c:1780
#, 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:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1788
+#: wt-status.c:1786
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1792
+#: wt-status.c:1790
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1905
+#: wt-status.c:1903
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr ""
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr ""
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2476
+#: wt-status.c:2474
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2478
+#: wt-status.c:2476
#, 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:456
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -8664,7 +8803,7 @@
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr ""
@@ -8677,7 +8816,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr ""
@@ -8712,8 +8851,8 @@
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/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
@@ -8722,7 +8861,7 @@
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr ""
@@ -8812,7 +8951,7 @@
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
@@ -8833,13 +8972,13 @@
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:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
-#: 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:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
@@ -8989,41 +9128,41 @@
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:1699 builtin/commit.c:395
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1704
+#: builtin/am.c:1703
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1771
+#: builtin/am.c:1770
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1815
+#: builtin/am.c:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1822
+#: builtin/am.c:1821
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9031,195 +9170,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:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2025
+#: builtin/am.c:2024
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:2131
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2172
+#: builtin/am.c:2171
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
-#: builtin/am.c:2176
+#: builtin/am.c:2175
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
-#: builtin/am.c:2207
+#: builtin/am.c:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2218
+#: builtin/am.c:2217
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:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2221
+#: builtin/am.c:2220
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2235
+#: builtin/am.c:2234
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2237
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:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr ""
-#: 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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr ""
-#: 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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2272
+#: builtin/am.c:2271
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2275
+#: builtin/am.c:2274
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2288
+#: builtin/am.c:2287
msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2294
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:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr ""
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2326
+#: builtin/am.c:2325
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2365
+#: builtin/am.c:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2371
+#: builtin/am.c:2370
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2381
+#: builtin/am.c:2380
msgid "interactive mode requires patches on the command line"
msgstr ""
@@ -9609,7 +9750,7 @@
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr ""
@@ -9677,14 +9818,14 @@
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr ""
@@ -9884,7 +10025,7 @@
msgid "do not use"
msgstr ""
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr ""
@@ -9976,103 +10117,103 @@
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:433
+#: builtin/tag.c:434
msgid "object"
msgstr ""
-#: builtin/branch.c:658
+#: builtin/branch.c:657
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:682 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:708
+#: builtin/branch.c:706
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:753
+#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:758
+#: builtin/branch.c:756
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:765
+#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:768
+#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:783
+#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:792
+#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:797
+#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:801
+#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:808
+#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:825
+#: builtin/branch.c:823
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:831
+#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:841
+#: builtin/branch.c:839
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-#: builtin/branch.c:845
+#: builtin/branch.c:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10094,19 +10235,19 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:66 builtin/pack-objects.c:3376
msgid "do not show progress meter"
msgstr ""
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr ""
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
@@ -10136,83 +10277,83 @@
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]"
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 git-submodule.sh:984
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 +10381,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:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr ""
@@ -10333,7 +10474,7 @@
#: 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/worktree.c:675
msgid "string"
msgstr ""
@@ -10361,148 +10502,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:256
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:261
+#: builtin/checkout.c:274
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:377
+#: builtin/checkout.c:395
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:382
+#: builtin/checkout.c:400
#, 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:407
#, 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:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:436
+#: builtin/checkout.c:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:463 builtin/checkout.c:468
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:527 builtin/checkout.c:534
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:704
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:734
+#: builtin/checkout.c:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:879
+#: builtin/checkout.c:903
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:920 builtin/checkout.c:1344
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:898
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -10517,7 +10658,7 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10534,26 +10675,26 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1152
#, 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:1159
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 +10706,325 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1169
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1235
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, 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:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1360
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1384
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:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1392
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:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1400
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1450
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
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr ""
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1530
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1533
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
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:1592
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1596
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
+#: builtin/checkout.c:1638
+#, c-format
+msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, 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:1697
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1706
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
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:1725
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:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1755
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1758
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1805
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1807
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1809
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
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:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -10890,7 +11033,7 @@
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -10909,27 +11052,27 @@
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,62 +11083,62 @@
"? - 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:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: 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
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11009,7 +11152,7 @@
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr ""
@@ -11029,11 +11172,11 @@
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr ""
@@ -11041,11 +11184,11 @@
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr ""
@@ -11060,7 +11203,7 @@
msgstr ""
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr ""
@@ -11076,8 +11219,8 @@
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr ""
@@ -11085,7 +11228,8 @@
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr ""
@@ -11093,12 +11237,12 @@
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
@@ -11115,11 +11259,11 @@
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr ""
@@ -11131,23 +11275,23 @@
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr ""
@@ -11175,166 +11319,166 @@
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr ""
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr ""
-#: 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"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:585
+#: builtin/clone.c:589
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr ""
-#: builtin/clone.c:776
+#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:927
+#: builtin/clone.c:933
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:985
+#: builtin/clone.c:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1010 builtin/fetch.c:1789
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:1014
+#: builtin/clone.c:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1024
+#: builtin/clone.c:1030
#, 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:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:1044
+#: builtin/clone.c:1050
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1064
+#: builtin/clone.c:1070
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1066
+#: builtin/clone.c:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1156
+#: builtin/clone.c:1162
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1158
+#: builtin/clone.c:1164
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1160
+#: builtin/clone.c:1166
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1163
+#: builtin/clone.c:1169
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1254
+#: builtin/clone.c:1260
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -11370,6 +11514,92 @@
msgid "--command must be the first argument"
msgstr ""
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr ""
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr ""
+
+#: builtin/commit-graph.c:79
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr ""
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr ""
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:157
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:159
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:161
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:163
+msgid "enable computation for changed paths"
+msgstr ""
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:170
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:172
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:174
+msgid "only expire files older than a given date-time"
+msgstr ""
+
+#: builtin/commit-graph.c:190
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/commit-graph.c:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr ""
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11381,7 +11611,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:547
#, c-format
msgid "not a valid object name %s"
msgstr ""
@@ -11409,13 +11639,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:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
msgid "commit message"
msgstr ""
@@ -11423,8 +11653,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:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
@@ -11461,10 +11691,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,106 +11711,110 @@
"\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:1099
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:319
#, 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
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -11586,7 +11824,7 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -11596,14 +11834,14 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -11611,389 +11849,326 @@
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:896
+#: builtin/commit.c:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1188
+#: builtin/commit.c:1189
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1192
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1198
+#: builtin/commit.c:1202
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1200
+#: builtin/commit.c:1204
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1208
+#: builtin/commit.c:1213
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1225
+#: builtin/commit.c:1231
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1231
+#: builtin/commit.c:1237
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr ""
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1382 builtin/commit.c:1540
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr ""
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1383
+#: builtin/commit.c:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1391 parse-options.h:192
msgid "when"
msgstr ""
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1388
+#: builtin/commit.c:1394
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1411
+#: builtin/commit.c:1417
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1494
+#: builtin/commit.c:1499
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr ""
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr ""
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
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:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr ""
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1503
+#: builtin/commit.c:1508
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1505
+#: builtin/commit.c:1510
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1506
+#: builtin/commit.c:1511
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1508
+#: builtin/commit.c:1513
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1519
+#: builtin/commit.c:1524
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1523
+#: builtin/commit.c:1528
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1645
-#, c-format
-msgid "could not read commit message: %s"
-msgstr ""
-
#: builtin/commit.c:1652
#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1659
+#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1657
+#: builtin/commit.c:1664
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1691
+#: builtin/commit.c:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"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 ""
@@ -12305,158 +12480,153 @@
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 ""
@@ -12679,7 +12849,7 @@
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1177 builtin/log.c:1724
msgid "refspec"
msgstr ""
@@ -12707,203 +12877,204 @@
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
-#: builtin/fetch.c:34
+#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:116
+#: builtin/fetch.c:117
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:140 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:142 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr ""
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:144 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:146 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:146
+#: builtin/fetch.c:147
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:151 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:152
+#: builtin/fetch.c:153
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:157 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:158
+#: builtin/fetch.c:159
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:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:171
+#: builtin/fetch.c:172 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:178 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:180
+#: builtin/fetch.c:181
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:183
+#: builtin/fetch.c:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:188 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:189 builtin/pull.c:226
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:196
+#: builtin/fetch.c:197 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:199
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:203
+#: builtin/fetch.c:204
msgid "write the commit-graph after fetching"
msgstr ""
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:751
+#: builtin/fetch.c:752
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-#: builtin/fetch.c:881
+#: builtin/fetch.c:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -12912,169 +13083,169 @@
" to avoid this check.\n"
msgstr ""
-#: builtin/fetch.c:920
+#: builtin/fetch.c:914
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:941
+#: builtin/fetch.c:935
#, 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:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, 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:1128
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1204
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1207
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1415
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1430
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1432
msgid "not setting upstream for a remote tag"
msgstr ""
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1434
msgid "unknown branch type"
msgstr ""
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
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:1562 builtin/fetch.c:1625
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1584
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1724
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1798
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1800
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1809
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1816
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: 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 ""
@@ -13114,7 +13285,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:440
msgid "respect format colors"
msgstr ""
@@ -13357,7 +13528,7 @@
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:134
msgid "show progress"
msgstr ""
@@ -13393,12 +13564,12 @@
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr ""
@@ -13487,258 +13658,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:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: 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 ""
-#: builtin/grep.c:633
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:724
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:803
+#: builtin/grep.c:823
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:805
+#: builtin/grep.c:825
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:807
+#: builtin/grep.c:827
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:809
+#: builtin/grep.c:829
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:825
+#: builtin/grep.c:845
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:846
+#: builtin/grep.c:866
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:867
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:850
+#: builtin/grep.c:870
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:852
+#: builtin/grep.c:872
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:874
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:857
+#: builtin/grep.c:877
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:859
+#: builtin/grep.c:879
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:864
+#: builtin/grep.c:884
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:885
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:887
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:869
+#: builtin/grep.c:889
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:892
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:895
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:883
+#: builtin/grep.c:903
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:885
+#: builtin/grep.c:905
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:904
+#: builtin/grep.c:924
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:906
+#: builtin/grep.c:926
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:908
+#: builtin/grep.c:928
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:916
+#: builtin/grep.c:936
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:983
+#: builtin/grep.c:1003
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1027
+#: builtin/grep.c:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1084 builtin/pack-objects.c:3548
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1127
+#: builtin/grep.c:1147
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1133
+#: builtin/grep.c:1153
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1141
+#: builtin/grep.c:1161
msgid "both --cached and trees are given"
msgstr ""
@@ -13777,108 +13948,108 @@
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:47
+#: builtin/help.c:48
msgid "exclude guides"
msgstr ""
-#: builtin/help.c:48
+#: builtin/help.c:49
msgid "print list of useful guides"
msgstr ""
-#: builtin/help.c:49
+#: builtin/help.c:50
msgid "print all configuration variable names"
msgstr ""
-#: builtin/help.c:51
+#: builtin/help.c:52
msgid "show man page"
msgstr ""
-#: builtin/help.c:52
+#: builtin/help.c:53
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:54
+#: builtin/help.c:55
msgid "show info page"
msgstr ""
-#: builtin/help.c:56
+#: builtin/help.c:57
msgid "print command description"
msgstr ""
-#: builtin/help.c:61
+#: builtin/help.c:62
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/help.c:77
+#: builtin/help.c:163
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:104
+#: builtin/help.c:190
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:117
+#: builtin/help.c:203
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:125
+#: builtin/help.c:211
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:221
+#: builtin/help.c:307
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:350
+#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:367
+#: builtin/help.c:453
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:375
+#: builtin/help.c:461
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:367
#, 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 ""
@@ -13916,7 +14087,7 @@
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
msgid "pack too large for current definition of off_t"
msgstr ""
@@ -13924,6 +14095,11 @@
msgid "pack exceeds maximum allowed size"
msgstr ""
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -13982,8 +14158,8 @@
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr ""
@@ -14044,7 +14220,7 @@
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr ""
@@ -14077,200 +14253,217 @@
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1391
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1430
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1438
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1462
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1598
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1646
#, 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:1653
#, 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:1692
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:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1782
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr ""
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr ""
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:334
+#: builtin/init-db.c:356
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr ""
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:414
+#: builtin/init-db.c:459
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:418
+#: builtin/init-db.c:463
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:419
+#: builtin/init-db.c:464
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:468
+#: builtin/init-db.c:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:544
+msgid "hash"
+msgstr ""
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr ""
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, 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:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
@@ -14337,507 +14530,507 @@
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:56
+#: builtin/log.c:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr ""
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:179
+#: builtin/log.c:184
msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:180
+#: builtin/log.c:185
msgid "decorate options"
msgstr ""
-#: builtin/log.c:183
+#: builtin/log.c:188
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:535
+#: builtin/log.c:556
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:814
+#: builtin/log.c:835
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:821
+#: builtin/log.c:842
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr ""
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1313
+#: builtin/log.c:1334
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1443
+#: builtin/log.c:1464
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1495
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1478
+#: builtin/log.c:1499
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1531
+#: builtin/log.c:1552
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/log.c:1629
+#: builtin/log.c:1650
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1632
+#: builtin/log.c:1653
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1640
+#: builtin/log.c:1661
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1641
+#: builtin/log.c:1662
msgid "sfx"
msgstr ""
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1644
+#: builtin/log.c:1665
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1646
+#: builtin/log.c:1667
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1665
+#: builtin/log.c:1686
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1667
+#: builtin/log.c:1688
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1669
+#: builtin/log.c:1690
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1671
+#: builtin/log.c:1692
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr ""
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr ""
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr ""
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr ""
-#: builtin/log.c:1679
+#: builtin/log.c:1698
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1681
+#: builtin/log.c:1700
msgid "message-id"
msgstr ""
-#: builtin/log.c:1682
+#: builtin/log.c:1701
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1702 builtin/log.c:1705
msgid "boundary"
msgstr ""
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1691
+#: builtin/log.c:1710
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1693
+#: builtin/log.c:1712
msgid "signature"
msgstr ""
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1696
+#: builtin/log.c:1715
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1698
+#: builtin/log.c:1717
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1701
+#: builtin/log.c:1720
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1703
+#: builtin/log.c:1722
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1706
+#: builtin/log.c:1725
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1708
+#: builtin/log.c:1727
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1792
+#: builtin/log.c:1812
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1809
+#: builtin/log.c:1829
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1817
+#: builtin/log.c:1837
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1973
+#: builtin/log.c:1993
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1981
+#: builtin/log.c:2001
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr ""
@@ -14852,7 +15045,7 @@
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
msgid "exec"
msgstr ""
@@ -14925,377 +15118,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 +15138,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 +15227,377 @@
msgid "Merging %s with %s\n"
msgstr ""
+#: builtin/merge.c:56
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:57
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:58
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:121
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:144
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:190
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:196
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:247 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:250 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:251 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:253 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:258 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:260 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:262
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:264 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:268 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:270 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:271 builtin/pull.c:172
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:272 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:274
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:281
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:283
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:285
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:287 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:294
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:716
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:730
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:745
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:797
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:806
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:812
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+msgstr ""
+
+#: builtin/merge.c:817
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:820
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:873
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:888
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:949
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:988
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:990
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:992
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:997
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1054
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1157
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1191
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1295
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1299
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1317
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1330
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1334
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1350
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1357
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1360
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1374
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1376
+msgid "You cannot combine --squash with --commit."
+msgstr ""
+
+#: builtin/merge.c:1392
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1409
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1411
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1416
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1418
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1499
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1508
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1518
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1564
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1571
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1596
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1602
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1630 builtin/merge.c:1695
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1634
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1686
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1688
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1697
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1711
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
@@ -15437,7 +15630,7 @@
"larger than this size"
msgstr ""
-#: 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 ""
@@ -15537,7 +15730,7 @@
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -15722,7 +15915,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:533
#, c-format
msgid "could not open or read '%s'"
msgstr ""
@@ -15943,7 +16136,7 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
@@ -15961,7 +16154,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:164
msgid "do not remove, show only"
msgstr ""
@@ -15977,349 +16170,349 @@
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:442
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:573
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:784
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:973
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:986
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1100
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1298
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1725
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1734
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2005
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, 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:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2260
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2714
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2802
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3168
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3388
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3390
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3392
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3396
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3398
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3400
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3408
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3410
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3412
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3415
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3418
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3421
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3424
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3428
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3435
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3441
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3443
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3451
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3455
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3459
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3464
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3493
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3498
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3552
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3554
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3559
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3562
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3568
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -16338,31 +16531,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 +16564,78 @@
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:478 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:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+
+#: builtin/pull.c:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:428
+#: builtin/pull.c:461
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:429
+#: builtin/pull.c:462
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:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -16437,74 +16643,70 @@
"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:470 builtin/rebase.c:1234 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
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:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:466
+#: builtin/pull.c:499
#, 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:610
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:857
+#: builtin/pull.c:895
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr ""
-
-#: builtin/pull.c:920
+#: builtin/pull.c:955
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:924
+#: builtin/pull.c:959
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -16512,7 +16714,7 @@
"commit %s."
msgstr ""
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -16523,15 +16725,15 @@
"to recover."
msgstr ""
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:975
+#: builtin/pull.c:1010
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -16641,12 +16843,12 @@
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
@@ -16675,65 +16877,65 @@
msgid "force updates"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:556
+#: builtin/push.c:555
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:567
+#: builtin/push.c:565
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:590
+#: builtin/push.c:587
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:592
+#: builtin/push.c:589
msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/push.c:612
+#: builtin/push.c:609
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -16746,27 +16948,27 @@
" git push <name>\n"
msgstr ""
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:630
+#: builtin/push.c:627
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:634
+#: builtin/push.c:631
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:636
+#: builtin/push.c:633
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:639
+#: builtin/push.c:636
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr ""
@@ -16890,190 +17092,190 @@
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:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr ""
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr ""
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr ""
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:461
+#: builtin/rebase.c:468
msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
+#: builtin/rebase.c:481 builtin/rebase.c:1374
+msgid "keep commits which start empty"
msgstr ""
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr ""
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr ""
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:489
+#: builtin/rebase.c:496
msgid "continue rebase"
msgstr ""
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr ""
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr ""
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr ""
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr ""
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr ""
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr ""
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr ""
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr ""
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr ""
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr ""
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr ""
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr ""
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr ""
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr ""
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr ""
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr ""
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr ""
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr ""
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr ""
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr ""
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/rebase.c:546
+#: builtin/rebase.c:553
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/rebase.c:562
+#: builtin/rebase.c:569
#, c-format
-msgid "%s requires an interactive rebase"
+msgid "%s requires the merge backend"
msgstr ""
#: builtin/rebase.c:612
@@ -17081,31 +17283,17 @@
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, 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:799 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17114,7 +17302,7 @@
"abort\"."
msgstr ""
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:882
#, c-format
msgid ""
"\n"
@@ -17126,14 +17314,14 @@
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -17144,7 +17332,7 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -17153,185 +17341,189 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1276
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1307
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1309
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1311
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1320
msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr ""
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1339
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1348
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1351
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1354
msgid "use apply strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1366
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1371
msgid "how to handle commits that become empty"
msgstr ""
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
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:1385
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1389
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1396
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1398
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1404
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1409
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+
+#: builtin/rebase.c:1426
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:1432
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1473
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr ""
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
msgid "cannot combine '--keep-base' with '--root'"
msgstr ""
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr ""
+
+#: builtin/rebase.c:1487
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1491
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1514
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
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:1545
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -17344,163 +17536,140 @@
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1638
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
msgid "cannot combine apply options with merge options"
msgstr ""
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1794
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr ""
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1853
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1861
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1887
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
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:1927
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:1984
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:1994
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2001
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2038
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, 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:843
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 +17686,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:863
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 +17698,11 @@
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1960
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr ""
@@ -18090,121 +18259,121 @@
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr ""
-#: 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 ""
-#: builtin/repack.c:191
+#: builtin/repack.c:193
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:232 builtin/repack.c:418
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:254
+#: builtin/repack.c:256
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:292
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:299
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:301
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:303
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:310
+#: builtin/repack.c:312
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:311
+#: builtin/repack.c:313
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:314
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:316
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr ""
-#: builtin/repack.c:318
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:320
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:322
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:324
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:326
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:328
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:338
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:342
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -18216,7 +18385,7 @@
"WARNING: Please rename them in %s manually:\n"
msgstr ""
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr ""
@@ -18515,91 +18684,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/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c: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,12 +18777,12 @@
"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 ""
@@ -18633,23 +18802,23 @@
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"
@@ -18832,15 +19001,15 @@
msgid "remote name"
msgstr ""
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr ""
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr ""
@@ -19053,69 +19222,57 @@
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
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:212
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr ""
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
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:326
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:395
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:420
#, 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:474 builtin/sparse-checkout.c:498
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:543
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr ""
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr ""
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr ""
@@ -19186,7 +19343,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,7 +19352,7 @@
msgid "%s is not a valid reference"
msgstr ""
-#: builtin/stash.c:225 git-legacy-stash.sh:75
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr ""
@@ -19225,7 +19382,7 @@
msgid "Merging %s with %s"
msgstr ""
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr ""
@@ -19248,104 +19405,104 @@
msgid "'%s' is not a stash reference"
msgstr ""
-#: 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 ""
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr ""
-#: 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 ""
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr ""
-#: builtin/stash.c:824
+#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1046
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1173
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1182
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:1193 builtin/stash.c:1202
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1230
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1279
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1298
+#: builtin/stash.c:1295
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1310
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1427
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1473 builtin/stash.c:1538
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
+#: builtin/stash.c:1573
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
#: builtin/stripspace.c:18
@@ -19764,17 +19921,25 @@
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2241 git-submodule.sh:176
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c:2257
+msgid "Suppress output for setting url of a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2329
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -19799,11 +19964,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:486
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr ""
@@ -19878,134 +20043,134 @@
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr ""
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:420
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:512
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr ""
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -20269,19 +20434,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr ""
@@ -20373,7 +20538,7 @@
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr ""
@@ -20447,170 +20612,170 @@
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:435 builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:434
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:443
+#: builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:449
+#: builtin/worktree.c:452
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:493
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:493
+#: builtin/worktree.c:496
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:512
+#: builtin/worktree.c:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:673
+#: builtin/worktree.c:676
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:690 builtin/worktree.c:723
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:692
+#: builtin/worktree.c:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:771
+#: builtin/worktree.c:774
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, 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:818
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:821
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:823
+#: builtin/worktree.c:826
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:874
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:875
+#: builtin/worktree.c:878
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:880
+#: builtin/worktree.c:883
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:903
+#: builtin/worktree.c:906
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:926
+#: builtin/worktree.c:929
#, 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:931
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:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
@@ -20631,17 +20796,106 @@
msgid "only useful for debugging"
msgstr ""
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr ""
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr ""
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr ""
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr ""
+
+#: bugreport.c:74
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+
+#: bugreport.c:91
+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 ""
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr ""
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr ""
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr ""
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr ""
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr ""
-#: fast-import.c:3254
+#: fast-import.c:3317
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
@@ -20676,7 +20930,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"
@@ -20686,7 +20940,7 @@
" <command> [<args>]"
msgstr ""
-#: git.c:34
+#: git.c:35
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -20694,139 +20948,139 @@
"See 'git help git' for an overview of the system."
msgstr ""
-#: git.c:186
+#: git.c:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:200
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:214
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:228
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:250
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:288
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:314
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:360
+#: git.c:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: git.c:369
+#: git.c:371
#, 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:378
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr ""
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr ""
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr ""
-#: git.c:793
+#: git.c:792
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:843
+#: git.c:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:876
+#: git.c:875
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:888
+#: git.c:887
#, 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:914
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:949
+#: http.c:993
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: http.c:1086
+#: http.c:1139
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1093
+#: http.c:1146
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1097
+#: http.c:1150
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:1966
+#: http.c:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -20943,6 +21197,14 @@
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:85
msgid "args"
msgstr ""
@@ -20996,11 +21258,11 @@
msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr ""
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr ""
@@ -21041,618 +21303,622 @@
msgstr ""
#: command-list.h:59
-msgid "Move objects and refs by archive"
+msgid "Collect information for user to file a bug report"
msgstr ""
#: command-list.h:60
-msgid "Provide content or type and size information for repository objects"
+msgid "Move objects and refs by archive"
msgstr ""
#: command-list.h:61
-msgid "Display gitattributes information"
+msgid "Provide content or type and size information for repository objects"
msgstr ""
#: command-list.h:62
-msgid "Debug gitignore / exclude files"
+msgid "Display gitattributes information"
msgstr ""
#: command-list.h:63
-msgid "Show canonical names and email addresses of contacts"
+msgid "Debug gitignore / exclude files"
msgstr ""
#: command-list.h:64
-msgid "Switch branches or restore working tree files"
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
#: command-list.h:65
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
msgstr ""
#: command-list.h:66
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:67
-msgid "Find commits yet to be applied to upstream"
+msgid "Ensures that a reference name is well formed"
msgstr ""
#: command-list.h:68
-msgid "Apply the changes introduced by some existing commits"
+msgid "Find commits yet to be applied to upstream"
msgstr ""
#: command-list.h:69
-msgid "Graphical alternative to git-commit"
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
#: command-list.h:70
-msgid "Remove untracked files from the working tree"
+msgid "Graphical alternative to git-commit"
msgstr ""
#: command-list.h:71
-msgid "Clone a repository into a new directory"
+msgid "Remove untracked files from the working tree"
msgstr ""
#: command-list.h:72
-msgid "Display data in columns"
+msgid "Clone a repository into a new directory"
msgstr ""
#: command-list.h:73
-msgid "Record changes to the repository"
+msgid "Display data in columns"
msgstr ""
#: command-list.h:74
-msgid "Write and verify Git commit-graph files"
+msgid "Record changes to the repository"
msgstr ""
#: command-list.h:75
-msgid "Create a new commit object"
+msgid "Write and verify Git commit-graph files"
msgstr ""
#: command-list.h:76
-msgid "Get and set repository or global options"
+msgid "Create a new commit object"
msgstr ""
#: command-list.h:77
-msgid "Count unpacked number of objects and their disk consumption"
+msgid "Get and set repository or global options"
msgstr ""
#: command-list.h:78
-msgid "Retrieve and store user credentials"
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
#: command-list.h:79
-msgid "Helper to temporarily store passwords in memory"
+msgid "Retrieve and store user credentials"
msgstr ""
#: command-list.h:80
-msgid "Helper to store credentials on disk"
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
#: command-list.h:81
-msgid "Export a single commit to a CVS checkout"
+msgid "Helper to store credentials on disk"
msgstr ""
#: command-list.h:82
-msgid "Salvage your data out of another SCM people love to hate"
+msgid "Export a single commit to a CVS checkout"
msgstr ""
#: command-list.h:83
-msgid "A CVS server emulator for Git"
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
#: command-list.h:84
-msgid "A really simple server for Git repositories"
+msgid "A CVS server emulator for Git"
msgstr ""
#: command-list.h:85
-msgid "Give an object a human readable name based on an available ref"
+msgid "A really simple server for Git repositories"
msgstr ""
#: command-list.h:86
-msgid "Show changes between commits, commit and working tree, etc"
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
#: command-list.h:87
-msgid "Compares files in the working tree and the index"
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
#: command-list.h:88
-msgid "Compare a tree to the working tree or index"
+msgid "Compares files in the working tree and the index"
msgstr ""
#: command-list.h:89
-msgid "Compares the content and mode of blobs found via two tree objects"
+msgid "Compare a tree to the working tree or index"
msgstr ""
#: command-list.h:90
-msgid "Show changes using common diff tools"
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
#: command-list.h:91
-msgid "Git data exporter"
+msgid "Show changes using common diff tools"
msgstr ""
#: command-list.h:92
-msgid "Backend for fast Git data importers"
+msgid "Git data exporter"
msgstr ""
#: command-list.h:93
-msgid "Download objects and refs from another repository"
+msgid "Backend for fast Git data importers"
msgstr ""
#: command-list.h:94
-msgid "Receive missing objects from another repository"
+msgid "Download objects and refs from another repository"
msgstr ""
#: command-list.h:95
-msgid "Rewrite branches"
+msgid "Receive missing objects from another repository"
msgstr ""
#: command-list.h:96
-msgid "Produce a merge commit message"
+msgid "Rewrite branches"
msgstr ""
#: command-list.h:97
-msgid "Output information on each ref"
+msgid "Produce a merge commit message"
msgstr ""
#: command-list.h:98
-msgid "Prepare patches for e-mail submission"
+msgid "Output information on each ref"
msgstr ""
#: command-list.h:99
-msgid "Verifies the connectivity and validity of the objects in the database"
+msgid "Prepare patches for e-mail submission"
msgstr ""
#: command-list.h:100
-msgid "Cleanup unnecessary files and optimize the local repository"
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
#: command-list.h:101
-msgid "Extract commit ID from an archive created using git-archive"
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
#: command-list.h:102
-msgid "Print lines matching a pattern"
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
#: command-list.h:103
-msgid "A portable graphical interface to Git"
+msgid "Print lines matching a pattern"
msgstr ""
#: command-list.h:104
-msgid "Compute object ID and optionally creates a blob from a file"
+msgid "A portable graphical interface to Git"
msgstr ""
#: command-list.h:105
-msgid "Display help information about Git"
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
#: command-list.h:106
-msgid "Server side implementation of Git over HTTP"
+msgid "Display help information about Git"
msgstr ""
#: command-list.h:107
-msgid "Download from a remote Git repository via HTTP"
+msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:108
-msgid "Push objects over HTTP/DAV to another repository"
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
#: command-list.h:109
-msgid "Send a collection of patches from stdin to an IMAP folder"
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
#: command-list.h:110
-msgid "Build pack index file for an existing packed archive"
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
#: command-list.h:111
-msgid "Create an empty Git repository or reinitialize an existing one"
+msgid "Build pack index file for an existing packed archive"
msgstr ""
#: command-list.h:112
-msgid "Instantly browse your working repository in gitweb"
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
#: command-list.h:113
-msgid "Add or parse structured information in commit messages"
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
#: command-list.h:114
-msgid "The Git repository browser"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:115
-msgid "Show commit logs"
+msgid "The Git repository browser"
msgstr ""
#: command-list.h:116
-msgid "Show information about files in the index and the working tree"
+msgid "Show commit logs"
msgstr ""
#: command-list.h:117
-msgid "List references in a remote repository"
+msgid "Show information about files in the index and the working tree"
msgstr ""
#: command-list.h:118
-msgid "List the contents of a tree object"
+msgid "List references in a remote repository"
msgstr ""
#: command-list.h:119
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "List the contents of a tree object"
msgstr ""
#: command-list.h:120
-msgid "Simple UNIX mbox splitter program"
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:121
-msgid "Join two or more development histories together"
+msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:122
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Join two or more development histories together"
msgstr ""
#: command-list.h:123
-msgid "Run a three-way file merge"
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
#: command-list.h:124
-msgid "Run a merge for files needing merging"
+msgid "Run a three-way file merge"
msgstr ""
#: command-list.h:125
-msgid "The standard helper program to use with git-merge-index"
+msgid "Run a merge for files needing merging"
msgstr ""
#: command-list.h:126
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:127
-msgid "Show three-way merge without touching index"
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
#: command-list.h:128
-msgid "Write and verify multi-pack-indexes"
+msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:129
-msgid "Creates a tag object"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:130
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Creates a tag object"
msgstr ""
#: command-list.h:131
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:132
-msgid "Find symbolic names for given revs"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:133
-msgid "Add or inspect object notes"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:134
-msgid "Import from and submit to Perforce repositories"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:135
-msgid "Create a packed archive of objects"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:136
-msgid "Find redundant pack files"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:137
-msgid "Pack heads and tags for efficient repository access"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:139
-msgid "Compute unique ID for a patch"
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
#: command-list.h:140
-msgid "Prune all unreachable objects from the object database"
+msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:141
-msgid "Remove extra objects that are already in pack files"
+msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:142
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:143
-msgid "Update remote refs along with associated objects"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:144
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:145
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:146
-msgid "Reads tree information into the index"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:147
-msgid "Reapply commits on top of another base tip"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:148
-msgid "Receive what is pushed into the repository"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:149
-msgid "Manage reflog information"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:150
-msgid "Manage set of tracked repositories"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:151
-msgid "Pack unpacked objects in a repository"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:152
-msgid "Create, list, delete refs to replace objects"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:153
-msgid "Generates a summary of pending changes"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:154
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:155
-msgid "Reset current HEAD to the specified state"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:156
-msgid "Restore working tree files"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:157
-msgid "Revert some existing commits"
+msgid "Restore working tree files"
msgstr ""
#: command-list.h:158
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:159
-msgid "Pick out and massage parameters"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:160
-msgid "Remove files from the working tree and from the index"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:161
-msgid "Send a collection of patches as emails"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:162
-msgid "Push objects over Git protocol to another repository"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:163
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:164
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:165
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:166
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:167
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:168
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:169
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:170
-msgid "Common Git shell script setup code"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:171
-msgid "Initialize and modify the sparse-checkout"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:172
-msgid "Stash the changes in a dirty working directory away"
+msgid "Initialize and modify the sparse-checkout"
msgstr ""
#: command-list.h:173
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:174
-msgid "Show the working tree status"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:175
-msgid "Remove unnecessary whitespace"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:176
-msgid "Initialize, update or inspect submodules"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:177
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:178
-msgid "Switch branches"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:179
-msgid "Read, modify and delete symbolic refs"
+msgid "Switch branches"
msgstr ""
#: command-list.h:180
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:181
-msgid "Creates a temporary file with a blob's contents"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:182
-msgid "Unpack objects from a packed archive"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:183
-msgid "Register file contents in the working tree to the index"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:184
-msgid "Update the object name stored in a ref safely"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:185
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:186
-msgid "Send archive back to git-archive"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:187
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:188
-msgid "Show a Git logical variable"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:189
-msgid "Check the GPG signature of commits"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:190
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:191
-msgid "Check the GPG signature of tags"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:192
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:193
-msgid "Show logs with difference each commit introduces"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:194
-msgid "Manage multiple working trees"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:195
-msgid "Create a tree object from the current index"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:196
-msgid "Defining attributes per path"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:197
-msgid "Git command-line interface and conventions"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:198
-msgid "A Git core tutorial for developers"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:199
-msgid "Git for CVS users"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:200
-msgid "Tweaking diff output"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:201
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:202
-msgid "A Git Glossary"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:203
-msgid "Hooks used by Git"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:204
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:205
-msgid "Defining submodule properties"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:206
-msgid "Git namespaces"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:207
-msgid "Git Repository Layout"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:208
-msgid "Specifying revisions and ranges for Git"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:209
-msgid "Mounting one repository inside another"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:210
-msgid "A tutorial introduction to Git: part two"
+msgid "Mounting one repository inside another"
msgstr ""
#: command-list.h:211
-msgid "A tutorial introduction to Git"
+msgid "A tutorial introduction to Git: part two"
msgstr ""
#: command-list.h:212
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr ""
@@ -21696,42 +21962,42 @@
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr ""
@@ -21773,128 +22039,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:205
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:215
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:232
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:242
+#: git-submodule.sh:244
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr ""
-#: git-submodule.sh:273
+#: git-submodule.sh:275
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:275
+#: git-submodule.sh:277
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:283
+#: git-submodule.sh:285
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:285
+#: git-submodule.sh:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -21905,122 +22089,122 @@
"option."
msgstr ""
-#: git-submodule.sh:291
+#: git-submodule.sh:293
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:303
+#: git-submodule.sh:305
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:308
+#: git-submodule.sh:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:600
+#: git-submodule.sh:602
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:605
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr ""
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, 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:638
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:637
+#: git-submodule.sh:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:642
+#: git-submodule.sh:644
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:649
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:650
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:655
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:654
+#: git-submodule.sh:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:896
+#: git-submodule.sh:878
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:948
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:971
+#: git-submodule.sh:953
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:974
+#: git-submodule.sh:956
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -22039,6 +22223,13 @@
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)"
diff --git a/po/it.po b/po/it.po
index e9f596b..acabb0d 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-05-15 09:11+0800\n"
+"PO-Revision-Date: 2020-05-15 08:28+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.04.0\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:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
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:3336
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:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry non riuscito per il percorso '%s'"
@@ -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:1851
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:1848
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
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr "percorso"
@@ -234,27 +234,27 @@
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:1765
#, 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:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -262,7 +262,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:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -279,22 +279,22 @@
"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:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -302,7 +302,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per lo stash."
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -316,22 +316,22 @@
"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:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -339,7 +339,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:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -356,22 +356,22 @@
"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:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -379,7 +379,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per l'applicazione."
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -393,25 +393,25 @@
"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
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -419,7 +419,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:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -433,26 +433,26 @@
"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:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -466,26 +466,26 @@
"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:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -499,7 +499,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:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -513,34 +513,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:319
#, 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:338 add-patch.c:342
#, 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:396
msgid "could not parse diff"
msgstr "impossibile analizzare il diff"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "impossibile analizzare il diff colorato"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "esecuzione di '%s' non riuscita"
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "output di interactive.diffFilter non corrispondente"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -548,7 +548,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:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -557,7 +557,7 @@
"attesa riga contesto %d in\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -570,13 +570,13 @@
"\tnon termina con:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Modalità manuale modifica hunt - vedi la fine del file per una guida "
"veloce.\n"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -590,7 +590,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:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -600,11 +600,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:1104
msgid "could not parse hunk header"
msgstr "impossibile analizzare l'header hunk"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' non riuscito"
@@ -729,49 +729,58 @@
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 +788,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:1353
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 +1102,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:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "lettura di %s non riuscita"
@@ -1289,7 +1298,7 @@
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:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr "impossibile aprire %s"
@@ -1355,7 +1364,7 @@
msgid "apply changes matching the given path"
msgstr "applica le modifiche corrispondenti al percorso specificato"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4973 builtin/am.c:2259
msgid "num"
msgstr "num"
@@ -1414,7 +1423,7 @@
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:5005 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"
@@ -1422,9 +1431,9 @@
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:5008 builtin/am.c:2238 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:3458 builtin/rebase.c:1332
msgid "action"
msgstr "azione"
@@ -1453,8 +1462,8 @@
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
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "visualizza ulteriori dettagli"
@@ -1469,7 +1478,7 @@
msgstr ""
"non fare affidamento sul numero di righe nelle intestazioni dei frammenti"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5032 builtin/am.c:2247
msgid "root"
msgstr "radice"
@@ -1477,142 +1486,6 @@
msgid "prepend <root> to all filenames"
msgstr "anteponi <radice> a tutti i nomi file"
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opzioni>] <albero> [<percorso>...]"
-
-#: 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 <repository> [--exec <comando>] [<opzioni>] <albero> "
-"[<percorso>...]"
-
-#: archive.c:17
-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"
@@ -1652,7 +1525,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
#, c-format
msgid "deflate error (%d)"
msgstr "errore deflate (%d)"
@@ -1662,6 +1535,142 @@
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>...]"
+
+#: 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 <repository> [--exec <comando>] [<opzioni>] <albero> "
+"[<percorso>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repository> [--exec <comando>] --list"
+
+#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file"
+
+#: archive.c:401
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "riferimento non esistente: %.*s"
+
+#: archive.c:407
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "%s non è un nome oggetto valido"
+
+#: archive.c:420
+#, c-format
+msgid "not a tree object: %s"
+msgstr "%s non è un oggetto albero valido"
+
+#: archive.c:432
+msgid "current working directory is untracked"
+msgstr "la directory di lavoro corrente non è tracciata"
+
+#: archive.c:464
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:464
+msgid "archive format"
+msgstr "formato archivio"
+
+#: archive.c:465 builtin/log.c:1674
+msgid "prefix"
+msgstr "prefisso"
+
+#: archive.c:466
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
+
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "file"
+
+#: archive.c:468 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "scrivi l'archivio in questo file"
+
+#: archive.c:470
+msgid "read .gitattributes in working directory"
+msgstr "leggi il file .gitattributes nella directory di lavoro"
+
+#: archive.c:471
+msgid "report archived files on stderr"
+msgstr "elenca i file archiviati sullo standard error"
+
+#: archive.c:472
+msgid "store only"
+msgstr "salva solamente"
+
+#: archive.c:473
+msgid "compress faster"
+msgstr "comprimi più velocemente"
+
+#: archive.c:481
+msgid "compress better"
+msgstr "comprimi meglio"
+
+#: archive.c:484
+msgid "list supported archive formats"
+msgstr "elenca i formati archivio supportati"
+
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "repository"
+
+#: archive.c:487 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "recupera l'archivio dal repository remoto <repository>"
+
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "comando"
+
+#: archive.c:489 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "percorso al comando remoto git-upload-archive"
+
+#: archive.c:496
+msgid "Unexpected option --remote"
+msgstr "Opzione --remote inattesa"
+
+#: archive.c:498
+msgid "Option --exec can only be used together with --remote"
+msgstr "L'opzione --exec può essere usata solo con --remote"
+
+#: archive.c:500
+msgid "Unexpected option --output"
+msgstr "Opzione --output inattesa"
+
+#: archive.c:522
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato archivio '%s' sconosciuto"
+
+#: archive.c:529
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argomento non supportato per il formato '%s': -%d"
+
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1754,12 +1763,12 @@
msgid "a %s revision is needed"
msgstr "è richiesta una revisione %s"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "impossibile creare il file '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "impossibile leggere il file '%s'"
@@ -1801,41 +1810,41 @@
msgstr[1] ""
"Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents e --reverse non sono compatibili."
-#: blame.c:2714
+#: blame.c:2791
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:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
"specificato l'ultimo commit"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "impostazione percorso revisioni non riuscita"
-#: blame.c:2762
+#: blame.c:2839
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:2850
#, c-format
msgid "no such path %s in %s"
msgstr "il percorso %s in %s non esiste"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossibile leggere il blob %s per il percorso %s"
@@ -1977,12 +1986,12 @@
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"
@@ -1997,8 +2006,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "intestazione non riconosciuta: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "impossibile aprire '%s'"
@@ -2050,7 +2059,7 @@
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:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argomento non riconosciuto: %s"
@@ -2073,18 +2082,309 @@
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:183
+msgid "commit-graph file is too small"
+msgstr "il file grafo dei commit %s è troppo piccolo"
+
+#: commit-graph.c:248
+#, 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:255
+#, 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:262
+#, 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:284
+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:294
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "offset blocco grafo dei commit improprio %08x%08x"
+
+#: commit-graph.c:362
+#, 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:436
+msgid "commit-graph has no base graphs chunk"
+msgstr "il grafo dei commit non ha un blocco grafi di base"
+
+#: commit-graph.c:446
+msgid "commit-graph chain does not match"
+msgstr "la catena del grafo dei commit non corrisponde"
+
+#: commit-graph.c:494
+#, 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:518
+msgid "unable to find all commit-graph files"
+msgstr "impossibile trovare tutti i file grafo dei commit"
+
+#: commit-graph.c:651 commit-graph.c:711
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"posizione commit non valida. Il grafo dei commit è probabilmente corrotto"
+
+#: commit-graph.c:672
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossibile trovare il commit %s"
+
+#: commit-graph.c:948 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossibile analizzare il commit %s"
+
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr ""
+"Scrittura dell'indice dei filtri di Bloom per i percorsi modificati in corso"
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr ""
+"Scrittura dei dati dei filtri di Bloom per i percorsi modificati in corso"
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "impossibile recuperare il tipo dell'oggetto %s"
+
+#: commit-graph.c:1196
+msgid "Loading known commits in commit graph"
+msgstr "Caricamento commit noti nel grafo dei commit in corso"
+
+#: commit-graph.c:1213
+msgid "Expanding reachable commits in commit graph"
+msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso"
+
+#: commit-graph.c:1233
+msgid "Clearing commit marks in commit graph"
+msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
+
+#: commit-graph.c:1252
+msgid "Computing commit graph generation numbers"
+msgstr "Calcolo numeri generazione del grafo dei commit in corso"
+
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+"Calcolo dei filtri di Bloom per i percorsi modificati nei commit in corso"
+
+#: commit-graph.c:1359
+#, 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:1372
+#, c-format
+msgid "error adding pack %s"
+msgstr "errore durante l'aggiunta del pack %s"
+
+#: commit-graph.c:1376
+#, c-format
+msgid "error opening index for %s"
+msgstr "errore durante l'apertura dell'indice per %s"
+
+#: commit-graph.c:1405
+#, 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:1426
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ID oggetto commit non valido: %s"
+
+#: commit-graph.c:1442
+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:1457
+msgid "Counting distinct commits in commit graph"
+msgstr "Conteggio commit distinti nel grafo dei commit in corso"
+
+#: commit-graph.c:1489
+msgid "Finding extra edges in commit graph"
+msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso"
+
+#: commit-graph.c:1538
+msgid "failed to write correct number of base graph ids"
+msgstr "impossibile scrivere il numero esatto degli ID grafo di base"
+
+#: commit-graph.c:1572 midx.c:812
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "impossibile creare le prime directory di %s"
+
+#: commit-graph.c:1585
+msgid "unable to create temporary graph layer"
+msgstr "impossibile creare il livello grafico temporaneo"
+
+#: commit-graph.c:1590
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossibile modificare i permessi condivisi per '%s'"
+
+#: commit-graph.c:1667
+#, 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:1712
+msgid "unable to open commit-graph chain file"
+msgstr "impossibile aprire il file catena grafo dei commit"
+
+#: commit-graph.c:1728
+msgid "failed to rename base commit-graph file"
+msgstr "impossibile ridenominare il file di base grafo dei commit"
+
+#: commit-graph.c:1748
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
+
+#: commit-graph.c:1874
+msgid "Scanning merged commits"
+msgstr "Scansione dei commit sottoposti a merge in corso"
+
+#: commit-graph.c:1885
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "ID commit duplicato inatteso: %s"
+
+#: commit-graph.c:1908
+msgid "Merging commit-graph"
+msgstr "Merge del grafo dei commit in corso"
+
+#: commit-graph.c:2096
+#, 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:2107
+msgid "too many commits to write graph"
+msgstr "troppi commit da scrivere nel grafo"
+
+#: commit-graph.c:2200
+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:2210
+#, 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:2220 commit-graph.c:2235
+#, 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:2227
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "impossibile analizzare il commit %s nel grafo dei commit"
+
+#: commit-graph.c:2245
+msgid "Verifying commits in commit graph"
+msgstr "Verifica dei commit nel grafo dei commit in corso"
+
+#: commit-graph.c:2259
+#, 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:2266
+#, 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:2276
+#, 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:2285
+#, 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:2298
+#, 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:2303
+#, 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:2307
+#, 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:2322
+#, 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:2328
+#, 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:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "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 +2404,27 @@
"Per disabilitare questo messaggio, esegui\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1168
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1432
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 +2435,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 +2454,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:2456
#, 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:3542
#, 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:2113
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:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s non valido: '%s'"
-#: config.c:2312
+#: config.c:2328
#, 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:2374
#, 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:2376
#, 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:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "nome sezione '%s' non valido"
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "%s ha più valori"
-#: config.c:2502
+#: config.c:2518
#, 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:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "impossibile bloccare il file di configurazione %s"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "apertura di %s in corso"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "pattern non valido: %s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "file di configurazione %s non valido"
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "fstat di %s non riuscita"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "impossibile eseguire mmap su '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "esecuzione chmod su %s non riuscita"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "impossibile scrivere il file di configurazione %s"
-#: config.c:2977
+#: config.c:2993
#, 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:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "impossibile eliminare l'impostazione di '%s'"
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "nome sezione non valido: %s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "valore mancante per '%s'"
@@ -2885,19 +2913,19 @@
msgid "unable to fork"
msgstr "impossibile eseguire fork"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Controllo connessione in corso"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "Impossibile eseguire 'git-rev-list'"
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "scrittura nella rev-list non riuscita"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "chiusura standard input della rev-list non riuscita"
@@ -2999,15 +3027,15 @@
msgid "external filter '%s' failed"
msgstr "esecuzione del filtro esterno '%s' non riuscita"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "tipo filtro inatteso"
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr "nome percorso troppo lungo per il filtro esterno"
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3016,20 +3044,49 @@
"il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi "
"siano stati filtrati"
-#: convert.c:1223
+#: convert.c:1243
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:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: esecuzione del filtro clean '%s' non riuscita"
-#: convert.c:1489
+#: convert.c:1511
#, 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:396
+#, 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:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'URL non ha uno schema: %s"
+
+#: credential.c:513
+#, 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 +3182,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>"
@@ -3199,36 +3247,36 @@
"Trovati errori nella variabile di configurazione 'diff.dirstat':\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr "processo esterno diff morto, mi fermo a %s"
-#: diff.c:4547
+#: diff.c:4583
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:4586
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:4664
msgid "--follow requires exactly one pathspec"
msgstr "--follow richiede esattamente uno specificatore percorso"
-#: diff.c:4676
+#: diff.c:4712
#, 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
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s richiede un valore numerico"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3237,42 +3285,42 @@
"Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, 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:4858
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valore sconosciuto dopo ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossibile risolvere '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s richiede il formato <n>/<m>"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s richiede un carattere, ricevuto '%s'"
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argomento --color-moved errato: %s"
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo non valido '%s' in --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3280,151 +3328,151 @@
"l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience"
"\" e \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "argomento non valido per %s"
-#: diff.c:5178
+#: diff.c:5214
#, 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:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argomento --word-diff errato: %s"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "Opzioni formato output diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "genera patch"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "non visualizzare l'output del diff"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "genera diff con <n> righe di contesto"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "genera il diff in formato grezzo"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "sinonimo di '-p --raw'"
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "sinonimo di '-p --stat'"
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "--stat leggibile da una macchina"
-#: diff.c:5287
+#: diff.c:5323
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:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "<parametro1,parametro2>..."
-#: diff.c:5290
+#: diff.c:5326
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:5330
msgid "synonym for --dirstat=cumulative"
msgstr "sinonimo di --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
-#: diff.c:5302
+#: diff.c:5338
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:5341
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:5344
msgid "show only names of changed files"
msgstr "visualizza solo i nomi dei file modificati"
-#: diff.c:5311
+#: diff.c:5347
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:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "genera diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "<ampiezza>"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "genera il diffstat con un'ampiezza specificata"
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr "genera il diffstat con un'ampiezza nomi specificata"
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr "genera il diffstat con un'ampiezza grafo specificata"
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr "<numero>"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "genera il diffstat con righe limitate"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "genera riassunto conciso nel diffstat"
-#: diff.c:5332
+#: diff.c:5368
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:5371
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:5373
msgid "show colored diff"
msgstr "visualizza diff colorato"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3432,7 +3480,7 @@
"evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o "
"'nuove' nel diff"
-#: diff.c:5342
+#: diff.c:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3440,91 +3488,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:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "<prefisso>"
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
-#: diff.c:5352
+#: diff.c:5388
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:5391
msgid "do not show any source or destination prefix"
msgstr "non visualizzare alcun prefisso sorgente o destinazione"
-#: diff.c:5358
+#: diff.c:5394
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:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "<carattere>"
-#: diff.c:5363
+#: diff.c:5399
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:5404
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:5409
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:5412
msgid "Diff rename options"
msgstr "Opzioni rinominazione diff"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5414
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:5418
msgid "detect renames"
msgstr "rileva le ridenominazioni"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "ometti la preimmagine per le eliminazioni"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "rileva le copie"
-#: diff.c:5393
+#: diff.c:5429
msgid "use unmodified files as source to find copies"
msgstr "usa file non modificati come sorgente per trovare copie"
-#: diff.c:5395
+#: diff.c:5431
msgid "disable rename detection"
msgstr "disabilita rilevamento ridenominazione"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "usa blob vuoti come sorgente ridenominazione"
-#: diff.c:5400
+#: diff.c:5436
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:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3532,159 +3580,159 @@
"impedisci il rilevamento ridenominazione/copia se il numero delle "
"destinazioni ridenominazione/copia eccede il limite specificato"
-#: diff.c:5405
+#: diff.c:5441
msgid "Diff algorithm options"
msgstr "Opzioni algoritmo diff"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "produci il diff più piccolo possibile"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "ignora gli spazi bianchi durante il confronto delle righe"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "ignora le modifiche al numero degli spazi bianchi"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "ignora modifiche agli spazi bianchi a fine riga"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "ignora carattere ritorno a capo a fine riga"
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr "ignora modifiche che riguardano solo righe vuote"
-#: diff.c:5425
+#: diff.c:5461
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:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"patience diff\""
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"histogram diff\""
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "seleziona un algoritmo diff"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "<testo>"
-#: diff.c:5438
+#: diff.c:5474
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:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "<modalità>"
-#: diff.c:5441
+#: diff.c:5477
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:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "<espressione regolare>"
-#: diff.c:5444
+#: diff.c:5480
msgid "use <regex> to decide what a word is"
msgstr "usa <espressione regolare> per decidere cosa costituisce una parola"
-#: diff.c:5447
+#: diff.c:5483
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:5486
msgid "moved lines of code are colored differently"
msgstr "le righe di codice spostate sono colorate in modo diverso"
-#: diff.c:5453
+#: diff.c:5489
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:5492
msgid "Other diff options"
msgstr "Altre opzioni diff"
-#: diff.c:5458
+#: diff.c:5494
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:5498
msgid "treat all files as text"
msgstr "tratta tutti i file come se fossero di testo"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "scambia i due input, genera un diff al contrario"
-#: diff.c:5466
+#: diff.c:5502
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:5504
msgid "disable all output of the program"
msgstr "disabilita l'intero output del programma"
-#: diff.c:5470
+#: diff.c:5506
msgid "allow an external diff helper to be executed"
msgstr "consenti l'esecuzione di un helper diff esterno"
-#: diff.c:5472
+#: diff.c:5508
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:5510
msgid "<when>"
msgstr "<quando>"
-#: diff.c:5475
+#: diff.c:5511
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:5514
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5479
+#: diff.c:5515
msgid "specify how differences in submodules are shown"
msgstr "specifica come verranno visualizzate le differenze nei sottomoduli"
-#: diff.c:5483
+#: diff.c:5519
msgid "hide 'git add -N' entries from the index"
msgstr "nascondi le voci 'git add -N' nell'indice"
-#: diff.c:5486
+#: diff.c:5522
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:5524
msgid "<string>"
msgstr "<stringa>"
-#: diff.c:5489
+#: diff.c:5525
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3692,7 +3740,7 @@
"cerca differenze che modificano il numero di occorrenze della stringa "
"specificata"
-#: diff.c:5492
+#: diff.c:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3700,24 +3748,24 @@
"cerca differenze che modificano il numero di occorrenze dell'espressione "
"regolare specificata"
-#: diff.c:5495
+#: diff.c:5531
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:5534
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:5537
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:5538
msgid "<object-id>"
msgstr "<ID oggetto>"
-#: diff.c:5503
+#: diff.c:5539
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3725,34 +3773,34 @@
"cerca differenze che modificano il numero di occorrenze dell'oggetto "
"specificato"
-#: diff.c:5505
+#: diff.c:5541
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:5542
msgid "select files by diff type"
msgstr "seleziona file in base al tipo diff"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "<file>"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "Salva l'output in un file specifico"
-#: diff.c:6164
+#: diff.c:6200
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:6203
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:6206
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3760,6 +3808,15 @@
"potresti voler impostare la variabile %s ad almeno %d e riprovare ad "
"eseguire il comando."
+#: 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:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3792,35 +3849,35 @@
msgid "cannot use %s as an exclude file"
msgstr "impossibile usare %s come file di esclusione"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "impossibile aprire la directory '%s'"
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "impossibile ottenere il nome e le informazioni sul kernel"
-#: dir.c:2603
+#: dir.c:2699
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:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr "file index corrotto nel repository %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "impossibile creare le directory per %s"
-#: dir.c:3486
+#: dir.c:3560
#, 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 ""
@@ -3830,17 +3887,17 @@
msgid "Filtering content"
msgstr "Filtraggio contenuto in corso"
-#: entry.c:476
+#: entry.c:479
#, 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 +3907,247 @@
msgid "too many args to run %s"
msgstr "troppi argomenti per eseguire %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: attesa lista shallow"
-#: fetch-pack.c:153
+#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow"
-#: fetch-pack.c:164
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush"
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'"
-#: fetch-pack.c:195
+#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "impossibile scrivere sul remoto"
-#: fetch-pack.c:257
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc richiede multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:357 fetch-pack.c:1364
#, c-format
msgid "invalid shallow line: %s"
msgstr "riga shallow non valida: '%s'"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:363 fetch-pack.c:1370
#, c-format
msgid "invalid unshallow line: %s"
msgstr "riga unshallow non valida: '%s'"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr "oggetto non trovato: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr "errore nell'oggetto: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr "nessuno shallow trovato: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "attesi shallow/unshallow, ricevuto %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr "ricevuto %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr "commit non valido: %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr "smetto di provare"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:340
msgid "done"
msgstr "fatto"
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr "ricevuto %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, 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:819
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:827
msgid "protocol error: bad pack header"
msgstr "errore protocollo: intestazione pack non valida"
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, 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:917
#, c-format
msgid "%s failed"
msgstr "%s non riuscito"
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr "errore nel demultiplexer della banda laterale"
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, 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:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 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:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr "Il server supporta %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr "Il server non supporta client shallow"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr "Il server non supporta --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr "Il server non supporta --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr "Il server non supporta --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr "nessun commit in comune"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: recupero non riuscito."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr "Il server non supporta le richieste shallow"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr "Il server supporta filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr "impossibile scrivere la richiesta sul remoto"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, 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:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr "atteso '%s', ricevuto '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "riga di conferma inattesa: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr "errore durante l'elaborazione degli ack: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
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:1344
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:1386
#, c-format
msgid "error processing shallow info: %d"
msgstr "errore durante l'elaborazione delle informazioni shallow: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "atteso wanted-ref, ricevuto '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inatteso: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, c-format
msgid "error processing wanted refs: %d"
msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1789
msgid "no matching remote head"
msgstr "nessun head remoto corrispondente"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 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:1839
#, c-format
msgid "no such remote ref %s"
msgstr "riferimento remoto non esistente: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, 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 +4166,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:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4185,7 +4242,7 @@
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:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipo elenco comandi non supportato: '%s'"
@@ -4194,20 +4251,20 @@
msgid "The common Git guides are:"
msgstr "Le guide Git comuni sono:"
-#: help.c:512
+#: help.c:427
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:432
msgid "External commands"
msgstr "Comandi esterni"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "Alias comandi"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4216,31 +4273,31 @@
"'%s' sembra essere un comando git, ma non è stato\n"
"possibile eseguirlo. Forse git-%s è corrotto?"
-#: help.c:655
+#: help.c:570
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:592
#, 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:597
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuo assumendo che intendessi '%s'."
-#: help.c:687
+#: help.c:602
#, 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:610
#, 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:614
msgid ""
"\n"
"The most similar command is"
@@ -4254,16 +4311,16 @@
"\n"
"I comandi maggiormente simili sono"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git version [<opzioni>]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4333,36 +4390,11 @@
msgid "name consists only of disallowed characters: %s"
msgstr "il nome è composto solo da caratteri non consentiti: %s"
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:436 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "formato data non valido: %s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "impossibile caricare l'albero radice per il commit %s"
-
-#: 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à>'"
@@ -4391,7 +4423,32 @@
msgid "multiple filter-specs cannot be combined"
msgstr "non è possibile combinare più specificatori filtro"
-#: lockfile.c:151
+#: 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"
+msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "impossibile caricare l'albero radice per il commit %s"
+
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4411,20 +4468,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"
@@ -4742,7 +4793,7 @@
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:3089 git-submodule.sh:985
msgid "submodule"
msgstr "sottomodulo"
@@ -4861,10 +4912,20 @@
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:3774 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "Impossibile scrivere l'indice."
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "lettura della cache non riuscita"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "impossibile scrivere il nuovo file index"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4914,109 +4975,117 @@
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:208
#, 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:258
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:286
msgid "error preparing packfile from multi-pack-index"
msgstr "errore durante la preparazione del packfile dal multi-pack-index"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "aggiunta del packfile '%s' non riuscita"
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "apertura del pack-index '%s' non riuscita"
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "ricerca dell'oggetto %d nel packfile non riuscita"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "Aggiunta dei file pack al multi-pack-index in corso"
-#: midx.c:875
+#: midx.c:873
#, 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:925
+msgid "no pack files to index."
+msgstr "nessun file pack da indicizzare."
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "Scrittura dei chunk nel multi-pack-index in corso"
-#: midx.c:1052
+#: midx.c:1056
#, 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:1112
msgid "Looking for referenced packfiles"
msgstr "Ricerca di file pack referenziati in corso"
-#: midx.c:1123
+#: midx.c:1127
#, 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:1132
+msgid "the midx contains no oid"
+msgstr "il midx non contiene alcun OID"
+
+#: midx.c:1141
msgid "Verifying OID order in multi-pack-index"
msgstr "Verifica ordine OID nel multi-pack-index in corso"
-#: midx.c:1137
+#: midx.c:1150
#, 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:1170
msgid "Sorting objects by packfile"
msgstr "Ordinamento degli oggetti nel packfile in corso"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "Verifica offset oggetti in corso"
-#: midx.c:1180
+#: midx.c:1193
#, 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:1199
#, 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:1208
#, 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:1233
msgid "Counting referenced objects"
msgstr "Conteggio degli oggetti referenziati in corso"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso"
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr "impossibile avviare pack-objects"
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr "impossibile finire pack-objects"
@@ -5102,6 +5171,11 @@
msgid "hash mismatch %s"
msgstr "hash non corrispondente: %s"
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossibile recuperare le dimensioni di %s"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset collocato prima della fine del packfile (.idx corrotto?)"
@@ -5118,10 +5192,25 @@
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:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nome oggetto '%s' malformato"
#: parse-options.c:38
#, c-format
@@ -5164,26 +5253,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "forse intendevi `--%s` (con due trattini)?"
-#: parse-options.c:857
+#: parse-options.c:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "alias di --%s"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "opzione sconosciuta `%s'"
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "opzione `%c` sconosciuta"
-#: parse-options.c:861
+#: parse-options.c:858
#, 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:882
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -5191,45 +5285,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr " oppure: %s"
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
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 +5361,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"
@@ -5380,7 +5449,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "impossibile creare lstat in versione threaded: %s"
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "impossibile analizzare il formato --pretty"
@@ -5393,29 +5462,42 @@
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:5143
#, 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'"
@@ -5533,9 +5615,9 @@
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "file indice corrotto"
@@ -5590,12 +5672,12 @@
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:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr "impossibile chiudere '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "impossibile eseguire lo stat di '%s'"
@@ -5731,14 +5813,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:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, 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:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "impossibile scrivere '%s'."
@@ -5771,132 +5853,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:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, 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:1936
msgid "gone"
msgstr "sparito"
@@ -6083,115 +6047,233 @@
msgid "malformed format string %s"
msgstr "stringa di formato %s malformata"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "nessun branch, eseguo il rebase di %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, 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:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "nessun branch, bisezione avviata su %s"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "nessun branch"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "oggetto %s mancante per %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, 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:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "oggetto malformato in '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, 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:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignoro il riferimento rotto %s"
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: atomo %%(end) mancante"
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "l'opzione `%s' non è compatibile con --merged"
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, 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:2508
#, c-format
msgid "malformed object name %s"
msgstr "nome dell'oggetto %s malformato"
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'opzione `%s' deve puntare ad un commit"
-#: remote.c:366
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s non punta a un oggetto valido!"
+
+#: refs.c:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignoro il riferimento simbolico pendente %s"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "impossibile aprire '%s' in scrittura: %s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "impossibile leggere il riferimento '%s'"
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "il riferimento '%s' esiste già"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "ID oggetto inatteso durante la scrittura di '%s'"
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossibile scrivere su '%s'"
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossibile aprire '%s' in scrittura"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "ID oggetto inatteso durante l'eliminazione di '%s'"
+
+#: refs.c:954
+#, 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:960
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "il registro per il riferimento %s è terminato inaspettatamente a %s"
+
+#: refs.c:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "il registro per %s è vuoto"
+
+#: refs.c:1111
+#, 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:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref per il riferimento '%s' non riuscita: %s"
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' esiste già; impossibile creare '%s'"
+
+#: refs.c:2113 refs.c:2148
+#, 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"
+
+#: remote.c:355
#, 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:403
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:411
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:594
#, 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:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s solitamente traccia %s, non %s"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s traccia sia %s sia %s"
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "la chiave '%s' del pattern non aveva un '*'"
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "il valore '%s' del pattern non ha un '*'"
-#: remote.c:1004
+#: remote.c:986
#, c-format
msgid "src refspec %s does not match any"
msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s"
-#: remote.c:1009
+#: remote.c:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -6202,7 +6284,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6228,7 +6310,7 @@
"Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n"
"Devi specificare un riferimento completamente qualificato."
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6239,7 +6321,7 @@
"è un oggetto tag. Forse intendevi creare un nuovo\n"
"branch eseguendo il push a '%s:refs/heads/%s'?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6250,7 +6332,7 @@
"è un oggetto tag. Forse intendevi creare un nuovo\n"
"branch eseguendo il push a '%s:refs/tags/%s'?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6262,7 +6344,7 @@
"tag a un nuovo albero eseguendo il push a\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6274,121 +6356,121 @@
"tag a un nuovo blob eseguendo il push a\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s non può essere risolto in un branch"
-#: remote.c:1106
+#: remote.c:1088
#, 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:1100
#, 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:1107
#, 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:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "HEAD non punta ad un branch"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "branch '%s' non esistente"
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "nessun upstream configurato per il branch '%s'"
-#: remote.c:1646
+#: remote.c:1628
#, 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:1643
#, 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:1655
#, 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:1665
#, 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:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr "il push non ha una destinazione (push.default è 'nothing')"
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr "impossibile risolvere il push 'simple' a una singola destinazione"
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "impossibile trovare il riferimento remoto %s"
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignoro localmente il riferimento strano '%s'"
-#: remote.c:2020
+#: remote.c:2002
#, 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:2006
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:2009
#, 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:2013
#, 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:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (usa \"%s\" per visualizzare i dettagli)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "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:2026
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:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6400,11 +6482,11 @@
"Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
"il fast forward.\n"
-#: remote.c:2055
+#: remote.c:2037
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:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6419,11 +6501,11 @@
"Il tuo branch e '%s' sono diventati divergenti\n"
"e hanno rispettivamente %d e %d commit differenti.\n"
-#: remote.c:2068
+#: remote.c:2050
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:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "impossibile analizzare il nome oggetto atteso '%s'"
@@ -6443,6 +6525,11 @@
msgid "replace depth too high for object %s"
msgstr "profondità sostituzione troppo elevata per l'oggetto %s"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "L'algoritmo hash %s non è supportato in questa compilazione."
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "MERGE_RR corrotta"
@@ -6501,7 +6588,7 @@
msgid "Recorded preimage for '%s'"
msgstr "Salvata preimmagine di '%s'"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6536,20 +6623,29 @@
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:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossibile trovare l'albero di %s"
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr "sembra che il tuo branch corrente sia rotto"
-#: revision.c:2500
+#: revision.c:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "il tuo branch corrente '%s' non ha ancora commit"
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent non è compatibile con --bisect"
-#: revision.c:2712
+#: revision.c:2870
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L non supporta ancora formati diff oltre a -p e -s"
@@ -6571,31 +6667,31 @@
"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:308
msgid "failed to sign the push certificate"
msgstr "firma del certificato per il push non riuscita"
-#: send-pack.c:423
+#: send-pack.c:399
msgid "the receiving end does not support --signed push"
msgstr "il ricevente non supporta i push --signed"
-#: send-pack.c:425
+#: send-pack.c:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6603,47 +6699,47 @@
"non invio un certificato push perché il ricevente non supporta i push --"
"signed"
-#: send-pack.c:437
+#: send-pack.c:413
msgid "the receiving end does not support --atomic push"
msgstr "il ricevente non supporta i push --atomic"
-#: send-pack.c:442
+#: send-pack.c:418
msgid "the receiving end does not support push options"
msgstr "il ricevente non supporta le opzioni push"
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "modalità pulizia messaggio commit non valida: '%s'"
-#: sequencer.c:296
+#: sequencer.c:297
#, 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:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "impossibile rimuovere '%s'"
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr "revert"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "azione sconosciuta: %d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6651,7 +6747,7 @@
"dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
"con 'git add <path>' o 'git rm <path>'"
-#: sequencer.c:392
+#: sequencer.c:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6661,44 +6757,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:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "impossibile bloccare '%s'"
-#: sequencer.c:412
+#: sequencer.c:413
#, 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:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr "finalizzazione di '%s' non riuscita"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr "impossibile leggere '%s'"
-#: sequencer.c:466
+#: sequencer.c:457
#, 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:461
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:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s: fast forward"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modalità pulizia non valida: %s"
@@ -6706,65 +6801,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: impossibile scrivere il nuovo file indice"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "impossibile aggiornare l'albero cache"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "impossibile risolvere il commit HEAD"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "nessuna chiave presente in '%.*s'"
-#: sequencer.c:757
+#: sequencer.c:748
#, 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:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossibile aprire '%s' in lettura"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' già specificato"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' già specificato"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' già specificato"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "variabile '%s' sconosciuta"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' mancante"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' mancante"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' mancante"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6794,11 +6889,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' non riuscito"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6825,7 +6920,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6851,328 +6946,333 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "impossibile trovare il commit appena creato"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "impossibile analizzare il commit appena creato"
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr "impossibile risolvere HEAD dopo la creazione del commit"
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr "HEAD scollegato"
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (commit radice)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "impossibile analizzare HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, 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:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr "impossibile analizzare il commit HEAD"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
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:1346 builtin/am.c:1566 builtin/merge.c:695
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:1379 sequencer.c:1450
#, 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:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr "scrittura dell'oggetto del commit non riuscita"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "impossibile aggiornare %s"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "impossibile analizzare il commit %s"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossibile analizzare il commit genitore %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "comando sconosciuto: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr "Questa è una combinazione di %d commit."
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr "è necessaria un'HEAD per il fixup"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "impossibile leggere l'HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr "impossibile leggere il messaggio di commit dell'HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "impossibile scrivere '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Questo è il primo messaggio di commit:"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, c-format
msgid "could not read commit message of %s"
msgstr "impossibile leggere il messaggio di commit di %s"
-#: sequencer.c:1662
+#: sequencer.c:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "Questo è il messaggio di commit numero %d:"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Il messaggio di commit numero %d sarà saltato:"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "il file indice non è stato sottoposto a merge."
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "impossibile eseguire il fixup sul commit radice"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, 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:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr "il commit %s non ha il genitore %d"
-#: sequencer.c:1804
+#: sequencer.c:1811
#, 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:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: impossibile analizzare il commit genitore %s"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossibile ridenominare '%s' in '%s'"
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "non è stato possibile eseguire il revert di %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "non è stato possibile applicare %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, 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:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: lettura dell'indice non riuscita"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: aggiornamento dell'indice non riuscito"
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s non accetta argomenti: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "argomenti mancanti per %s"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "impossibile analizzare '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "riga %d non valida: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "impossibile eseguire '%s' senza un commit precedente"
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr "annullo un'operazione di cherry-pick in corso"
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "annullo un'operazione di revert in corso"
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "correggi la situazione usando 'git rebase --edit-todo'."
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "foglio istruzioni inutilizzabile: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "nessun commit analizzato."
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr "impossibile eseguire un cherry-pick durante un revert."
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "impossibile eseguire un revert durante un cherry-pick."
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "valore non valido per %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "squash-onto inutilizzabile"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "foglio opzioni malformati: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "è stato passato un insieme di commit vuoto"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "un'operazione di revert è già in corso"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "prova \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "un'operazione di cherry-pick è già in corso"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, 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:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossibile creare la directory sequencer '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr "impossibile bloccare HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
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:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "impossibile risolvere HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
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:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "impossibile aprire '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossibile leggere '%s': %s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "fine del file inattesa"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, 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:2830
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:2871
msgid "no revert in progress"
msgstr "nessun revert in corso"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "nessun cherry-pick in corso"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "salto del commit non riuscito"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "non c'è nulla da saltare"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -7181,21 +7281,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:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "impossibile leggere l'HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossibile copiare '%s' in '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7214,22 +7309,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Impossibile applicare %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, 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:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossibile copiare '%s' in '%s'"
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Eseguo %s\n"
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7244,11 +7344,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
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:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7265,102 +7365,128 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nome etichetta illecito: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "scrittura commit radice falso in corso"
-#: sequencer.c:3261
+#: sequencer.c:3279
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:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "impossibile risolvere '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "impossibile eseguire il merge senza una revisione corrente"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossibile analizzare '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "non c'è nulla di cui eseguire il merge: '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3437
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:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossibile ottenere il messaggio di commit per '%s'"
-#: sequencer.c:3594
+#: sequencer.c:3613
#, 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:3629
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:3703
+msgid "Cannot autostash"
+msgstr "Impossibile eseguire lo stash automatico"
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Risposta stash non attesa: '%s'"
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossibile creare la directory '%s'"
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Stash automatico creato: %s\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "impossibile eseguire reset --hard"
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "Stash automatico applicato.\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, 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:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"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:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'applicazione dello stash automatico ha generato dei conflitti."
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Uno stash automatica esiste già; creo una nuova voce stash."
+
+#: sequencer.c:3857
#, 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:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "impossibile scollegare l'HEAD"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Fermato a HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "Fermato a %s\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7382,49 +7508,59 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebase in corso (%d/%d)%s"
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Fermato a %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr "comando %d sconosciuto"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "impossibile leggere orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "impossibile leggere 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossibile aggiornare l'HEAD a %s"
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase e aggiornamento di %s eseguiti con successo.\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"impossibile eseguire il rebase: ci sono delle modifiche non in staging."
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "impossibile modificare un commit inesistente"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "file non valido: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenuti non validi: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7435,59 +7571,59 @@
"di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
"--continue'."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "impossibile scrivere il file: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "impossibile eseguire il commit delle modifiche in staging."
-#: sequencer.c:4338
+#: sequencer.c:4446
#, 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:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisione non valida"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "impossibile eseguire il revert come commit iniziale"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script: opzioni non gestite"
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr "make_script: errore durante la preparazione delle revisioni"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "nulla da fare"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "impossibile saltare i comandi pick non necessari"
-#: sequencer.c:5213
+#: sequencer.c:5336
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 +7633,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 +7645,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 +7663,93 @@
"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:569
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Attesa versione repository Git <= %d, trovata %d"
-#: setup.c:567
+#: setup.c:577
msgid "unknown repository extensions found:"
msgstr "trovate estensioni repository sconosciute:"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "errore durante l'apertura di '%s'"
-#: setup.c:588
+#: setup.c:598
#, 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:600
#, c-format
msgid "error reading %s"
msgstr "errore durante la lettura di %s"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "formato file Git non valido: %s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "nessun percorso presente nel file Git: %s"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "%s non è un repository Git"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' è troppo grande"
-#: setup.c:709
+#: setup.c:722
#, 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:751 setup.c:753 setup.c:784
#, 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:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "impossibile tornare alla directory di lavoro corrente"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "stat di '%*s%s%s' non riuscito"
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr "Impossibile leggere la directory di lavoro corrente"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "impossibile entrare in '%s'"
-#: setup.c:1128
+#: setup.c:1141
#, 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:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7623,7 +7759,7 @@
"Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM "
"non è impostata)."
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7633,275 +7769,275 @@
"(0%.3o).\n"
"Il proprietario dei file deve avere sempre i permessi di lettura e scrittura."
-#: setup.c:1289
+#: setup.c:1304
msgid "open /dev/null or dup failed"
msgstr "apertura di /dev/null o dup non riuscita"
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr "fork non riuscita"
-#: setup.c:1309
+#: setup.c:1324
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:2454
#, 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:2458
#, 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:1640
#, c-format
msgid "failed to read object %s"
msgstr "lettura dell'oggetto %s non riuscita"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s sostitutivo non trovato per %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, 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:1652
#, 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:1757
#, c-format
msgid "unable to write file %s"
msgstr "impossibile scrivere il file %s"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossibile impostare i permessi a '%s'"
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "errore di scrittura del file"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "errore durante la chiusura del file oggetto sciolto"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, 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:1858
msgid "unable to create temporary file"
msgstr "impossibile creare il file temporaneo"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "impossibile scrivere il file oggetto sciolto"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, 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:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd non riuscita sull'oggetto %s (%d)"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, 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:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr "utime() di %s non riuscita"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "impossibile leggere l'oggetto per %s"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "commit corrotto"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "tag corrotto"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "errore di lettura durante l'indicizzazione di %s"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, 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:2206 sha1-file.c:2216
#, 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:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo di file non supportato"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "%s non è un oggetto valido"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, 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:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "impossibile aprire %s"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "mancata corrispondenza per %s (atteso %s)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "impossibile eseguire mmap su %s"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossibile decomprimere l'intestazione di %s"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "impossibile analizzare l'intestazione di %s"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossibile decomprimere i contenuti di %s"
@@ -8008,43 +8144,43 @@
msgstr "nome oggetto non valido: '%.*s'."
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, 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:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, 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:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, 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:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8052,18 +8188,44 @@
msgstr[1] "%u byte"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, 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:1180
#, 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 ""
@@ -8127,7 +8289,7 @@
msgid "process for submodule '%s' failed"
msgstr "il processo per il sottomodulo '%s' non è uscito con successo"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Impossibile risolvere HEAD come riferimento valido."
@@ -8248,41 +8410,15 @@
"'%s' a\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "impossibile avviare ls-files in .."
-#: submodule.c:2248
+#: submodule.c:2250
#, 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
#, c-format
msgid "running trailer command '%s' failed"
@@ -8337,99 +8473,6 @@
msgid "could not rename temporary file to %s"
msgstr "impossibile ridenominare il file temporaneo in %s"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "impossibile leggere il bundle '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "trasporto: opzione profondità '%s' non valida"
-
-#: transport.c:266
-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
-msgid "server options require protocol version 2 or later"
-msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "impossibile analizzare la configurazione transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "supporto alla versione 2 del protocollo non ancora implementato"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valore sconosciuto per la configurazione '%s': %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "trasporto '%s' non consentito"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync non è più supportato"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"I seguenti percorsi sottomodulo contengono modifiche\n"
-"non trovate su nessun remoto:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Prova\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o esegui un cd al percorso e usa\n"
-"\n"
-"\tgit push\n"
-"\n"
-"per eseguirne il push a un remoto.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Interrompo l'operazione."
-
-#: transport.c:1201
-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"
@@ -8474,7 +8517,7 @@
msgid "error while running fast-import"
msgstr "errore durante l'esecuzione di fast-import"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "impossibile leggere il riferimento %s"
@@ -8494,6 +8537,10 @@
msgid "invalid remote service path"
msgstr "percorso servizio remoto non valido"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "operazione non supportata dal protocollo"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8534,26 +8581,26 @@
msgid "helper %s does not support 'push-option'"
msgstr "l'helper %s non supporta 'push-option'"
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"l'helper remoto non supporta il push; è necessario uno specificatore "
"riferimento"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'helper %s non supporta 'force'"
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "impossibile eseguire fast-export"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "errore durante l'esecuzione di fast-export"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8562,50 +8609,139 @@
"Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n"
"Forse dovresti specificare un branch come 'master'.\n"
-#: transport-helper.c:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "risposta malformata nell'elenco riferimenti: %s"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) non riuscita"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) non riuscita"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "thread %s non riuscito"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "join non riuscita per il thread %s: %s"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "impossibile avviare il thread per la copia dei dati: %s"
-#: transport-helper.c:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "wait non riuscita per il processo %s"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "processo %s non riuscito"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
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"
+msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "impossibile leggere il bundle '%s'"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "trasporto: opzione profondità '%s' non valida"
+
+#: transport.c:266
+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
+msgid "server options require protocol version 2 or later"
+msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "impossibile analizzare la configurazione transport.color.*"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "supporto alla versione 2 del protocollo non ancora implementato"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valore sconosciuto per la configurazione '%s': %s"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "trasporto '%s' non consentito"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync non è più supportato"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"I seguenti percorsi sottomodulo contengono modifiche\n"
+"non trovate su nessun remoto:\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Prova\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o esegui un cd al percorso e usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per eseguirne il push a un remoto.\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "Interrompo l'operazione."
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "push di tutti i sottomoduli richiesti non riuscito"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "oggetto albero troppo corto"
@@ -8622,7 +8758,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 +8768,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 +8778,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 +8788,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 +8798,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 +8809,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 +8819,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 +8829,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 +8839,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 +8859,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 +8869,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 +8879,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 +8889,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 +8900,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 +8911,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 +8921,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 +8931,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 +8941,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 +8951,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 +8966,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 +9027,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:1337
+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,35 +9068,35 @@
msgid "Fetching objects"
msgstr "Recupero oggetti in corso"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "lettura di '%s' non riuscita"
-#: worktree.c:305
+#: worktree.c:309
#, 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:320
#, 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:332
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' non esiste"
-#: worktree.c:334
+#: worktree.c:338
#, 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:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' non punta a '%s'"
@@ -9005,11 +9154,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:1072
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:1081
msgid "Changes not staged for commit:"
msgstr "Modifiche non nell'area di staging per il commit:"
@@ -9117,22 +9266,22 @@
msgid "untracked content, "
msgstr "contenuto non tracciato, "
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Lo stash attualmente ha %d voce"
msgstr[1] "Lo stash attualmente ha %d voci"
-#: wt-status.c:938
+#: wt-status.c:936
msgid "Submodules changed but not updated:"
msgstr "Sottomoduli modificati ma non aggiornati:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Modifiche ai sottomoduli di cui verrà eseguito il 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."
@@ -9140,7 +9289,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:1112
#, c-format
msgid ""
"\n"
@@ -9152,111 +9301,111 @@
"precedenti/successivi nel branch.\n"
"Puoi usare '--no-ahead-behind' per evitare il calcolo.\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "Hai dei percorsi non sottoposti a merge."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (risolvi i conflitti ed esegui \"git commit\")"
-#: wt-status.c:1149
+#: wt-status.c:1147
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:1151
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:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (usa \"git commit\" per terminare il merge)"
-#: wt-status.c:1165
+#: wt-status.c:1163
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:1166
msgid "The current patch is empty."
msgstr "La patch corrente è vuota."
-#: wt-status.c:1172
+#: wt-status.c:1170
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:1172
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:1174
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:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo è mancante."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Nessun comando eseguito."
-#: 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] "Ultimo comando eseguito (%d comando eseguito):"
msgstr[1] "Ultimi comandi eseguiti (%d comandi eseguiti):"
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (vedi di più nel file %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Nessun comando rimanente."
-#: 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] "Prossimo comando da eseguire (%d comando rimanente):"
msgstr[1] "Prossimi comandi da eseguire (%d comandi rimanenti):"
-#: wt-status.c:1341
+#: wt-status.c:1339
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:1351
#, 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:1356
msgid "You are currently rebasing."
msgstr "Attualmente stai eseguendo un rebase."
-#: wt-status.c:1371
+#: wt-status.c:1369
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:1371
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:1373
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:1380
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:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9264,145 +9413,145 @@
"Attualmente stai dividendo un commit durante il rebase del branch '%s' su "
"'%s'."
-#: wt-status.c:1391
+#: wt-status.c:1389
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:1392
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:1396
#, 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:1401
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:1404
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:1406
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:1417
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick in corso."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, 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:1427
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:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (esegui \"git cherry-pick --continue\" per continuare)"
-#: wt-status.c:1435
+#: wt-status.c:1433
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:1435
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:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Revert in corso."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Attualmente stai eseguendo il revert del commit %s."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (esegui \"git revert --continue\" per continuare)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")"
-#: wt-status.c:1466
+#: wt-status.c:1464
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:1466
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:1476
#, 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:1480
msgid "You are currently bisecting."
msgstr "Attualmente stai eseguendo una bisezione."
-#: 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\" per tornare al branch originario)"
-#: wt-status.c:1694
+#: wt-status.c:1692
msgid "On branch "
msgstr "Sul branch "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "rebase interattivo in corso su "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "rebase in corso su "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "Attualmente non sei su alcun branch."
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "Commit iniziale"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "Non ci sono ancora commit"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "File non tracciati"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "File ignorati"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9414,31 +9563,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:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "File non tracciati non elencati%s"
-#: wt-status.c:1759
+#: wt-status.c:1757
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:1763
msgid "No changes"
msgstr "Nessuna modifica"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, 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:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "nessuna modifica aggiunta al commit\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9447,75 +9596,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:1777
#, 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:1780
#, 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:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "non c'è nulla di cui eseguire il commit\n"
-#: wt-status.c:1788
+#: wt-status.c:1786
#, 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:1790
#, 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:1903
msgid "No commits yet on "
msgstr "Non ci sono ancora commit su"
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD (nessun branch)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "differente"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "indietro "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "avanti "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, 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:2474
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:2476
#, 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 +9678,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,7 +9691,7 @@
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:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "Impossibile leggere l'indice"
@@ -9577,8 +9726,8 @@
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/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "test controllato"
@@ -9587,7 +9736,7 @@
msgid "interactive picking"
msgstr "scelta interattiva"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "seleziona gli hunk in modalità interattiva"
@@ -9696,7 +9845,7 @@
msgid "adding files failed"
msgstr "aggiunta dei file non riuscita"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file non è compatibile con --interactive/--patch"
@@ -9717,15 +9866,15 @@
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:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
"--pathspec-from-file 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:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul richiede --pathspec-from-file"
@@ -9887,35 +10036,35 @@
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:1699 builtin/commit.c:395
msgid "unable to write index file"
msgstr "impossibile scrivere il file indice"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
#, 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:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr "Applicazione in corso: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr "Nessuna modifica -- patch già applicata."
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch non riuscita a %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1770
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:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9925,7 +10074,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:1821
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 +10087,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:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossibile analizzare l'oggetto '%s'."
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr "pulizia dell'indice non riuscita"
-#: builtin/am.c:2025
+#: builtin/am.c:2024
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9957,158 +10106,160 @@
"'am'.\n"
"Non ritorno indietro a ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2131
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valore non valido per --patch-format: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
#, 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:2175
#, 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:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opzioni>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr "esegui in modalità interattiva"
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr "opzione storica -- non esegue nulla"
-#: builtin/am.c:2218
+#: builtin/am.c:2217
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:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "non visualizzare messaggi"
-#: builtin/am.c:2221
+#: builtin/am.c:2220
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:2223
msgid "recode into utf8 (default)"
msgstr "converti codifica in UTF-8 (impostazione predefinita)"
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr "fornisci l'argomento -k a git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr "fornisci l'argomento -b a git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr "fornisci l'argomento -m a git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
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:2234
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:2237
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:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr "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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c: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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr "formato"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr "il formato delle patch"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
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:2271
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:2274
msgid "synonyms for --continue"
msgstr "sinonimi di --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr "salta la patch corrente"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
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:2283
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:2287
msgid "show the patch being applied"
msgstr "visualizza la patch in fase di applicazione"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr "menti sulla data del commit"
-#: builtin/am.c:2295
+#: builtin/am.c:2294
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:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "ID chiave"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr "firma i commit con GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr "(a uso interno per git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -10116,18 +10267,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:2325
msgid "failed to read the index"
msgstr "lettura dell'indice non riuscita"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, 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:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10136,11 +10287,11 @@
"Trovata directory smarrita %s.\n"
"Usa \"git am --abort\" per eliminarla."
-#: builtin/am.c:2371
+#: builtin/am.c:2370
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:2380
msgid "interactive mode requires patches on the command line"
msgstr ""
"la modalità interattiva richiede che le patch siano fornite sulla riga di "
@@ -10576,7 +10727,7 @@
msgid "Ignore whitespace differences"
msgstr "Ignora le differenze relative agli spazi bianchi"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr "revisione"
@@ -10645,14 +10796,14 @@
msgid "4 years, 11 months ago"
msgstr "4 anni, 11 giorni fa"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "il file %s ha solo %lu riga"
msgstr[1] "il file %s ha solo %lu righe"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Eseguo il blame sulle righe"
@@ -10870,7 +11021,7 @@
msgid "do not use"
msgstr "non usare"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "upstream"
@@ -10962,73 +11113,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 +11187,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 +11221,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."
@@ -11094,20 +11245,20 @@
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:66 builtin/pack-objects.c:3376
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:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr "visualizza la barra di avanzamento"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
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:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento"
@@ -11138,7 +11289,7 @@
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,7 +11297,7 @@
"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]"
@@ -11154,75 +11305,75 @@
"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 "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 git-submodule.sh:984
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 +11401,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:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "non visualizzare l'avanzamento dell'operazione"
@@ -11343,7 +11494,7 @@
#: 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/worktree.c:675
msgid "string"
msgstr "stringa"
@@ -11371,100 +11522,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:256
#, 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:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "percorso '%s': impossibile eseguire il merge"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, 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:395
#, 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:400
#, 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:407
#, 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:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' non può essere usato con %s"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, 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:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "né '%s' né '%s' sono stati specificati"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, 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:463 builtin/checkout.c:468
#, 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:527 builtin/checkout.c:534
#, 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:704
msgid "you need to resolve your current index first"
msgstr "prima devi risolvere l'indice corrente"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11473,50 +11624,50 @@
"impossibile continuare con modifiche in stage nei file seguenti:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, 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:903
msgid "HEAD is now at"
msgstr "HEAD si trova ora a"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "impossibile aggiornare HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ripristina il branch '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "Si è già su '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, 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:920 builtin/checkout.c:1344
#, 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:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Si è passati al branch '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr " ...e altri %d.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11539,7 +11690,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11566,19 +11717,19 @@
" git branch <nome del nuovo branch> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "errore interno durante la visita delle revisioni"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr "La precedente posizione di HEAD era"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
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:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11587,7 +11738,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:1159
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 +11759,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:1169
#, 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:1235
msgid "only one reference expected"
msgstr "atteso solo un riferimento"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, 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:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "riferimento non valido: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, c-format
msgid "reference is not a tree: %s"
msgstr "il riferimento non è un albero: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "atteso branch, ricevuto tag '%s'"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1360
#, 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:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "atteso branch, ricevuto '%s'"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "atteso branch, ricevuto commit '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11660,7 +11811,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:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11668,7 +11819,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:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11676,7 +11827,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:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11684,7 +11835,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:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11692,147 +11843,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:1400
msgid "you are switching branch while bisecting"
msgstr "stai cambiando branch durante una bisezione"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
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:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' non può essere usato con '%s'"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' non accetta l'argomento <punto di partenza>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, 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:1450
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:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forza l'indicazione d'avanzamento dell'operazione"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "stile"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
msgid "conflict style (merge or diff3)"
msgstr "stile conflitti (merge o diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "scollega l'HEAD al commit specificato"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr "imposta le informazioni sull'upstream per il nuovo branch"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "nuovo branch"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "nuovo branch senza genitore"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "aggiorna i file ignorati (impostazione predefinita)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
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:1530
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:1533
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:1537
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:1592
+#, 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:1596
msgid "-p and --overlay are mutually exclusive"
msgstr "le opzioni -p e --overlay sono mutualmente esclusive"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
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:1638
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "nome del branch mancante; prova con -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr "impossibile risolvere %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr "specificatore percorso non valido"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, 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:1697
#, 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:1706
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:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file non è compatibile con --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11840,110 +11993,110 @@
"git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n"
"si esegue il checkout dell'indice."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1725
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:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "branch"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
msgstr "crea un nuovo branch ed eseguine il checkout"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
msgid "create/reset and checkout a branch"
msgstr "crea/reimposta un branch ed eseguine il checkout"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1755
msgid "create reflog for new branch"
msgstr "crea il registro dei riferimenti per il nuovo branch"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1758
msgid "use overlay mode (default)"
msgstr "usa modalità overlay (impostazione predefinita)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
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:1805
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:1807
msgid "second guess 'git switch <no-such-branch>'"
msgstr "prevedi 'git switch <branch inesistente>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1809
msgid "throw away local modifications"
msgstr "scarta le modifiche locali"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
msgstr "albero da cui eseguire il checkout"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr "ripristina l'indice"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr "ripristina l'albero di lavoro (impostazione predefinita)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr "ignora voci non sottoposte a merge"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
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 +12109,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 +12136,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 +12175,56 @@
"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:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "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
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr "-x e -X non possono essere usati insieme"
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12079,7 +12232,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:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12095,7 +12248,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:536
msgid "create a bare repository"
msgstr "crea un repository spoglio"
@@ -12115,11 +12268,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,11 +12280,11 @@
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:533
msgid "template-directory"
msgstr "directory modelli"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "directory da cui saranno recuperati i modelli"
@@ -12146,7 +12299,7 @@
msgstr "usa --reference solo durante la clonazione"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr "nome"
@@ -12162,8 +12315,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:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "profondità"
@@ -12171,7 +12324,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:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr "tempo"
@@ -12179,12 +12333,12 @@
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:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
msgstr "revisione"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"aumenta la profondità della cronologia del clone shallow fino alla revisione "
@@ -12203,11 +12357,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:542
msgid "gitdir"
msgstr "directory Git"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "separa la directory Git dall'albero di lavoro"
@@ -12219,23 +12373,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:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
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:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
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:192 builtin/pull.c:234
+#: builtin/push.c:571
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:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr "usa solo indirizzi IPv6"
@@ -12269,32 +12423,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 +12459,102 @@
"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:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr "Troppi argomenti."
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr "Devi specificare un repository da clonare."
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, 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:991
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:1004
#, 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:1789
#, 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:1030
#, 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:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, 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:1050
#, 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:1070
#, 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:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clone in '%s' in corso...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12408,36 +12562,36 @@
"il clone --recursive non è compatibile né con --reference né con --reference-"
"if-able"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
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:1162
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:1164
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:1166
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:1169
msgid "source repository is shallow, ignoring --local"
msgstr "il repository sorgente è shallow, ignoro l'opzione --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr "l'opzione --local è ignorata"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, 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:1260
msgid "You appear to have cloned an empty repository."
msgstr "Sembra che tu abbia clonato un repository vuoto."
@@ -12473,6 +12627,98 @@
msgid "--command must be the first argument"
msgstr "--command deve essere il primo argomento"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+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:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <directory oggetti>] [--append]"
+" [--split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits]"
+" [--changed-paths] [--[no-]progress] <opzioni split>"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossibile trovare la directory oggetti corrispondente a %s"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr "directory"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "La directory oggetti in cui memorizzare il grafo"
+
+#: builtin/commit-graph.c:79
+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:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Impossibile aprire il grafo dei commit '%s'"
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argomento --split non riconosciuto, %s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "inizia la visita da tutti i riferimenti"
+
+#: builtin/commit-graph.c:157
+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:159
+msgid "start walk at commits listed by stdin"
+msgstr "inizia la visita ai commit elencati sullo standard input"
+
+#: builtin/commit-graph.c:161
+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:163
+msgid "enable computation for changed paths"
+msgstr "abilita calcolo percorsi modificati"
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr "consenti la scrittura di un file grafo dei commit incrementale"
+
+#: builtin/commit-graph.c:170
+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:172
+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:174
+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:190
+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:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID oggetto non esadecimale inatteso: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12486,7 +12732,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:547
#, c-format
msgid "not a valid object name %s"
msgstr "%s non è un nome oggetto valido"
@@ -12514,13 +12760,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:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: 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:1506
msgid "commit message"
msgstr "messaggio di commit"
@@ -12528,8 +12774,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:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "firma il commit con GPG"
@@ -12576,10 +12822,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 +12851,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,38 +12926,38 @@
"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:1099
#, 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:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lettura del messaggio di log dallo standard input)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c: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
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12718,7 +12972,7 @@
"\t%s\n"
"e riprova.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12733,7 +12987,7 @@
"\t%s\n"
"e riprova.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12742,7 +12996,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:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12753,144 +13007,148 @@
"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:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutore: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sEsecutore commit: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "Impossibile leggere l'indice"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "Errore durante la costruzione degli alberi"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' non è nel formato 'Nome <e-mail>' e non corrisponde ad alcun "
"autore esistente"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo non valido ignorato: '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo file non tracciati non valido: '%s'"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "--long e -z non sono compatibili"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "Non c'è nulla da modificare."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
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:1189
+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:1192
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:1202
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:1204
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:1213
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:1231
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:1237
#, 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:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr "visualizza concisamente lo stato"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr "visualizza le informazioni sul branch"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "visualizza le informazioni sullo stash"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr "calcola tutti i valori dopo/prima di"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr "versione"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "output leggibile da una macchina"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
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:1382 builtin/commit.c:1540
msgid "terminate entries with NUL"
msgstr "termina le voci con NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
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:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12898,11 +13156,11 @@
"visualizza file ignorati, modalità facoltative: traditional, matching, no. "
"(Impostazione predefinita: traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1391 parse-options.h:192
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12910,175 +13168,175 @@
"ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, "
"untracked. (Impostazione predefinita: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1394
msgid "list untracked files in columns"
msgstr "elenca i file non tracciati in colonne"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "non rilevare le ridenominazioni"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
msgid "detect renames, optionally set similarity index"
msgstr ""
"rileva le ridenominazioni, imposta facoltativamente l'indice di similarità"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1417
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:1499
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:1500
msgid "show diff in commit message template"
msgstr "visualizza il diff nel modello del messaggio di commit"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "Commit message options"
msgstr "Opzioni messaggio di commit"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "leggi il messaggio da un file"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr "autore"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr "sovrascrivi l'autore per il commit"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr "data"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
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:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
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:1508
msgid "reuse message from specified commit"
msgstr "riusa il messaggio del commit specificato"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
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:1510
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:1511
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:1512 builtin/log.c:1655 builtin/merge.c:293
+#: 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:1513
msgid "use specified template file"
msgstr "usa il file modello specificato"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr "forza la modifica del commit"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "include status in commit message template"
msgstr "includi lo stato nel modello del messaggio di commit"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "Commit contents options"
msgstr "Opzioni contenuto commit"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr "esegui il commit di tutti i file modificati"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
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:1524
msgid "interactively add files"
msgstr "aggiungi i file in modalità interattiva"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr "aggiungi le modifiche in modalità interattiva"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr "esegui il commit solo dei file specificati"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ignora gli hook pre-commit e commit-msg"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1528
msgid "show what would be committed"
msgstr "visualizza gli elementi di cui sarebbe eseguito il commit"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr "modifica il commit precedente"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr "ignora l'hook post-rewrite"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr "accetta di registrare una modifica vuota"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
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:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "File MERGE_HEAD corrotto (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr "impossibile leggere MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1652
#, c-format
msgid "could not read commit message: %s"
msgstr "impossibile leggere il messaggio di commit: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1659
#, 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:1664
#, 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:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13090,78 +13348,6 @@
"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>]"
@@ -13494,51 +13680,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 +13728,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 +13737,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,94 +13751,94 @@
"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"
@@ -13894,7 +14075,7 @@
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:1177 builtin/log.c:1724
msgid "refspec"
msgstr "specificatore riferimento"
@@ -13925,107 +14106,108 @@
"Impossibile fornire entrambe le opzioni --import-marks e --import-marks-if-"
"exists"
-#: builtin/fetch.c:34
+#: 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:117
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel non può essere negativo"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:140 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:142 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:144 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:146 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:147
msgid "force overwrite of local reference"
msgstr "forza la sovrascrittura del riferimento locale"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
msgid "fetch from multiple remotes"
msgstr "esegui il fetch da più remoti"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:151 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:153
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:155
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:157 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:159
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:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr "a richiesta"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "control recursive fetching of submodules"
msgstr "controlla il recupero ricorsivo dei sottomoduli"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "mantieni il pack scaricato"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
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:170 builtin/fetch.c:176 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:172 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:178 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "converti in un repository completo"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:181
msgid "prepend this to submodule path output"
msgstr "anteponi questo prefisso all'output del percorso del sottomodulo"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14033,94 +14215,94 @@
"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:188 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:189 builtin/pull.c:226
msgid "refmap"
msgstr "mappa riferimenti"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "specifica la mappa dei riferimenti per il fetch"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:197 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
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr "esegui 'gc --auto' dopo il fetch"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 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:204
msgid "write the commit-graph after fetching"
msgstr "scrivi il grafo dei commit dopo il fetch"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr "Impossibile trovare l'HEAD del riferimento remoto"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, 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:752
#, c-format
msgid "object %s not found"
msgstr "oggetto %s non trovato"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr "[aggiornato]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr "[rifiutato]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr "impossibile eseguire il fetch nel branch corrente"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
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:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr "impossibile aggiornare il riferimento locale"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr "sovrascriverebbe il tag esistente"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr "[nuovo tag]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr "[nuovo branch]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr "[nuovo riferimento]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr "aggiornamento forzato"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr "non fast forward"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14131,7 +14313,7 @@
"riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n"
"fetch.showForcedUpdates true'."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14143,22 +14325,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:914
#, 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:935
#, 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:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
msgstr "Da %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14168,58 +14350,58 @@
"eseguire\n"
" 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1128
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s diventerà pendente)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s è diventato pendente)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr "[eliminato]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr "(nessuno)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, 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:1204
#, 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:1207
#, 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:1415
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "rilevati branch multipli, stato incompatibile con --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1430
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:1432
msgid "not setting upstream for a remote tag"
msgstr "non imposto l'upstream per un tag remoto"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1434
msgid "unknown branch type"
msgstr "tipo branch sconosciuto"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14227,22 +14409,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:1562 builtin/fetch.c:1625
#, 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:1572 builtin/fetch.c:1627 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Impossibile recuperare %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1584
#, 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:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14250,45 +14432,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:1724
msgid "You need to specify a tag name."
msgstr "Devi specificare il nome di un tag."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr "Le profondità negative in --deepen non sono supportate"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "le opzioni --deepen e --depth sono mutualmente esclusive"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow non possono essere usati insieme."
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
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:1798
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:1800
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:1809
#, 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:1816
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:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14296,29 +14478,29 @@
"--filter può essere usato solo con il remoto configurato nelle estensioni."
"partialclone"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <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"
@@ -14361,7 +14543,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"
@@ -14606,7 +14788,7 @@
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:786 builtin/prune.c:134
msgid "show progress"
msgstr "visualizza l'avanzamento"
@@ -14642,12 +14824,12 @@
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:475 builtin/init-db.c:57
#, 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:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "impossibile leggere '%s'"
@@ -14751,263 +14933,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:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, 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:724
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch '%c' richiede un valore numerico"
-#: builtin/grep.c:803
+#: builtin/grep.c:823
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:825
msgid "find in contents not managed by git"
msgstr "la ricerca nei contenuti non è gestita da Git"
-#: builtin/grep.c:807
+#: builtin/grep.c:827
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:829
msgid "ignore files specified via '.gitignore'"
msgstr "ignora i file specificati in '.gitignore'"
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "cerca ricorsivamente in ogni sottomodulo"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "visualizza le righe non corrispondenti"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola"
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr "elabora i file binari come testuali"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr "non cercare corrispondenze ai pattern nei file binari"
-#: builtin/grep.c:825
+#: builtin/grep.c:845
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:847
msgid "search in subdirectories (default)"
msgstr "cerca nelle sottodirectory (impostazione predefinita)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "scendi al più di <profondità> livelli"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "usa espressioni regolari POSIX estese"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr "interpreta i pattern come stringhe fisse"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "usa espressioni regolari compatibili con Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "visualizza numeri di riga"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
msgid "show column number of first match"
msgstr "visualizza il numero di colonna della prima corrispondenza"
-#: builtin/grep.c:847
+#: builtin/grep.c:867
msgid "don't show filenames"
msgstr "non visualizzare i nomi file"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "visualizza i nomi file"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
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:872
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:874
msgid "synonym for --files-with-matches"
msgstr "sinonimo di --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
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:879
msgid "print NUL after filenames"
msgstr "stampa NUL dopo i nomi file"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show only matching parts of a line"
msgstr "visualizza solo le parti corrispondenti di una riga"
-#: builtin/grep.c:864
+#: builtin/grep.c:884
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:885
msgid "highlight matches"
msgstr "evidenzia corrispondenze"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
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:889
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:892
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:895
msgid "show <n> context lines before matches"
msgstr "visualizza <n> righe di contesto prima delle corrispondenze"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr "visualizza <n> righe di contesto dopo le corrispondenze"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr "usa <n> thread di lavoro"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "scorciatoia per -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
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:905
msgid "show the surrounding function"
msgstr "visualizza la funzione circostante"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "leggi le corrispondenze da un file"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "cerca corrispondenze con <pattern>"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "combina i pattern specificati con -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
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:926
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:928
msgid "show parse tree for grep expression"
msgstr "visualizza l'albero di analisi per l'espressione grep"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr "pager"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "visualizza i file corrispondenti nel pager"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "consenti"
-#: builtin/grep.c:983
+#: builtin/grep.c:1003
msgid "no pattern given"
msgstr "nessun pattern specificato"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
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:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossibile risolvere la revisione %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "l'opzione --untracked non è supportata con --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
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:1084 builtin/pack-objects.c:3548
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:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "specificato numero non valido di thread (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
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:1147
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:1153
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:1161
msgid "both --cached and trees are given"
msgstr "sono specificati sia --cached sia degli alberi"
@@ -15050,66 +15232,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 +15300,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,35 +15309,35 @@
"'%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:367
#, 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"
@@ -15193,7 +15375,7 @@
msgid "used more bytes than were available"
msgstr "usati più byte di quelli disponibili"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
msgid "pack too large for current definition of off_t"
msgstr "pack troppo largo per la definizione corrente di off_t"
@@ -15201,6 +15383,11 @@
msgid "pack exceeds maximum allowed size"
msgstr "il pack supera la dimensione massima consentita"
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossibile creare '%s'"
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -15259,8 +15446,8 @@
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "TROVATA COLLISIONE SHA1 CON %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr "impossibile leggere %s"
@@ -15321,7 +15508,7 @@
msgid "Resolving deltas"
msgstr "Risoluzione dei delta"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr "impossibile creare il thread: %s"
@@ -15354,169 +15541,178 @@
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:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "l'oggetto locale %s è corrotto"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, 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:1430
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossibile scrivere il file %s '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1438
#, 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:1462
msgid "error while closing pack file"
msgstr "errore nella chiusura del file pack"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "impossibile archiviare il file pack"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr "impossibile archiviare index file"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> non valida"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, 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:1598
#, 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:1646
#, 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:1653
#, 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:1692
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:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "%s errato"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
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:1782
msgid "--stdin requires a git repository"
msgstr "--stdin richiede un repository Git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
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:1836 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:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "impossibile eseguire stat sul modello '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "impossibile aprire la directory '%s'"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "impossibile leggere il link '%s'"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, 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:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "impossibile copiare '%s' in '%s'"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "ignoro il modello %s"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "modelli non trovati in %s"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, 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:356
#, 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:359
#, 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:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr "tentativo di reinizializzare il repository con un hash differente"
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritmo hash '%s' sconosciuto"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s esiste già"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, 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:459
#, 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:463
#, 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:464
#, 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:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15524,25 +15720,33 @@
"git init [-q | --quiet] [--bare] [--template=<directory-modello>] [--"
"shared[=<permessi>]] [<directory>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "permessi"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:544
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "specifica l'algoritmo hash da usare"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr "impossibile creare la directory %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr "impossibile modificare la directory corrente in %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15551,7 +15755,7 @@
"%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-"
"dir=<directory>)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossibile accedere all'albero di lavoro '%s'"
@@ -15620,126 +15824,126 @@
msgid "no input file given for in-place editing"
msgstr "nessun file di input specificato per la modifica sul posto"
-#: builtin/log.c:56
+#: builtin/log.c:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [<opzioni>] <oggetto>..."
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opzione --decorate non valida: %s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "visualizza sorgente"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr "Usa il file mappatura e-mail"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr "decora solo i riferimenti corrispondenti a <pattern>"
-#: builtin/log.c:179
+#: builtin/log.c:184
msgid "do not decorate refs that match <pattern>"
msgstr "non decorare i riferimenti corrispondenti a <pattern>"
-#: builtin/log.c:180
+#: builtin/log.c:185
msgid "decorate options"
msgstr "opzioni decorazione"
-#: builtin/log.c:183
+#: builtin/log.c:188
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:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output finale: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, 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:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "impossibile leggere l'oggetto %s"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "tipo sconosciuto: %d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: modo lettera da descrizione non valido"
-#: builtin/log.c:821
+#: builtin/log.c:842
msgid "format.headers without value"
msgstr "format.headers non ha alcun valore"
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr "il nome della directory di output è troppo lungo"
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr "impossibile aprire il file patch %s"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "è necessario specificare esattamente un intervallo"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "il valore non è un intervallo"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "la lettera di accompagnamento dev'essere in formato e-mail"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr "creazione del file lettera di accompagnamento non riuscita"
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "valore in-reply-to folle: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1334
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:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, 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:1455 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "impossibile risolvere '%s' come riferimento valido"
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15751,288 +15955,288 @@
"In alternativa puoi specificare manualmente il commit di base con\n"
"--base=<ID commit di base>"
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
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:1499
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:1552
msgid "cannot get patch id"
msgstr "impossibile ottenere l'ID della patch"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "inferenza degli intervalli range-diff non riuscita"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
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:1653
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] anche con più patch"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "stampa le patch sullo standard output"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "genera una lettera di accompagnamento"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
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:1662
msgid "sfx"
msgstr "suff"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "usa <suff> anziché '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1665
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:1667
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:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] anziché [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "modo-lettera-da-descrizione"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
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:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefisso>] anziché [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "salva i file risultanti in <dir>"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "non eliminare/aggiungere [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "non mandare in output diff binari"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
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:1688
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:1690
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:1692
msgid "Messaging"
msgstr "Messaggistica"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "intestazione"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "aggiungi intestazione e-mail"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "aggiungi intestazione A:"
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr "aggiungi intestazione Cc:"
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr "identità"
-#: builtin/log.c:1679
+#: builtin/log.c:1698
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:1700
msgid "message-id"
msgstr "ID messaggio"
-#: builtin/log.c:1682
+#: builtin/log.c:1701
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:1702 builtin/log.c:1705
msgid "boundary"
msgstr "delimitatore"
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr "allega la patch"
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr "includi la patch nel messaggio"
-#: builtin/log.c:1691
+#: builtin/log.c:1710
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"abilita il raggruppamento messaggi per conversazione, stili: superficiale, "
"profondo"
-#: builtin/log.c:1693
+#: builtin/log.c:1712
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr "aggiungi una firma"
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr "commit di base"
-#: builtin/log.c:1696
+#: builtin/log.c:1715
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:1717
msgid "add a signature from a file"
msgstr "aggiungi una firma da file"
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr "non stampare i nomi file delle patch"
-#: builtin/log.c:1701
+#: builtin/log.c:1720
msgid "show progress while generating patches"
msgstr "visualizza l'avanzamento dell'operazione di generazione patch"
-#: builtin/log.c:1703
+#: builtin/log.c:1722
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:1725
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:1727
msgid "percentage by which creation is weighted"
msgstr "percentuale in base a cui viene pesata la creazione"
-#: builtin/log.c:1792
+#: builtin/log.c:1812
#, c-format
msgid "invalid ident line: %s"
msgstr "riga ident non valida: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr "le opzioni -n e -k sono mutuamente esclusive"
-#: builtin/log.c:1809
+#: builtin/log.c:1829
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:1837
msgid "--name-only does not make sense"
msgstr "--name-only non ha senso"
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr "--name-status non ha senso"
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr "--check non ha senso"
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr "standard output, o directory, quale dei due?"
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff richiede --cover-letter o una singola patch"
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff rispetto alla versione %d:"
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor richiede --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:1993
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:2001
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff rispetto alla versione %d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr "impossibile leggere il file firma '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr "Generazione delle patch in corso"
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr "creazione dei file di output non riuscita"
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16040,113 +16244,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 +16368,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:1384
msgid "exec"
msgstr "eseguibile"
@@ -16240,394 +16444,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 +16464,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 +16557,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:121
+msgid "switch `m' requires a value"
+msgstr "lo switch 'm' richiede un valore"
+
+#: builtin/merge.c:144
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "l'opzione `%s' richiede un valore"
+
+#: builtin/merge.c:190
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n"
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available strategies are:"
+msgstr "Le strategie disponibili sono:"
+
+#: builtin/merge.c:196
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Le strategie personalizzate disponibili sono:"
+
+#: builtin/merge.c:247 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:250 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:251 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(sinonimo di --stat)"
+
+#: builtin/merge.c:253 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:256 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:258 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:260 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "modifica il messaggio prima di eseguire il commit"
+
+#: builtin/merge.c:262
+msgid "allow fast-forward (default)"
+msgstr "consenti fast forward (impostazione predefinita)"
+
+#: builtin/merge.c:264 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "interrompi se il fast forward non è possibile"
+
+#: builtin/merge.c:268 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:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
+msgid "strategy"
+msgstr "strategia"
+
+#: builtin/merge.c:270 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "strategia di merge da usare"
+
+#: builtin/merge.c:271 builtin/pull.c:172
+msgid "option=value"
+msgstr "opzione=valore"
+
+#: builtin/merge.c:272 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opzione per la strategia di merge selezionata"
+
+#: builtin/merge.c:274
+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:281
+msgid "abort the current in-progress merge"
+msgstr "interrompi il merge attualmente in corso"
+
+#: builtin/merge.c:283
+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:285
+msgid "continue the current in-progress merge"
+msgstr "continua il merge attualmente in corso"
+
+#: builtin/merge.c:287 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "consenti di unire cronologie non correlate"
+
+#: builtin/merge.c:294
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ignora gli hook pre-merge-commit e commit-msg"
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "non è stato possibile eseguire stash."
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "esecuzione di stash non riuscita"
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr "non è un oggetto valido: %s"
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr "read-tree non riuscito"
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr " (nulla di cui eseguire lo squash)"
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Commit di squash -- non aggiorno HEAD\n"
+
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n"
+
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' non punta ad un commit"
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Stringa branch.%s.mergeoptions errata: %s"
+
+#: builtin/merge.c:716
+msgid "Not handling anything other than two heads merge."
+msgstr "Non gestisco nulla che non sia il merge di due head."
+
+#: builtin/merge.c:730
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opzione sconosciuta per merge-recursive: -X%s"
+
+#: builtin/merge.c:745
+#, c-format
+msgid "unable to write %s"
+msgstr "impossibile scrivere %s"
+
+#: builtin/merge.c:797
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Non è stato possibile leggere da '%s'"
+
+#: builtin/merge.c:806
+#, 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:812
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\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:817
+msgid "An empty message aborts the commit.\n"
+msgstr "Un messaggio vuoto interromperà il commit.\n"
+
+#: builtin/merge.c:820
+#, 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:873
+msgid "Empty commit message."
+msgstr "Messaggio di commit vuoto."
+
+#: builtin/merge.c:888
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Splendido.\n"
+
+#: builtin/merge.c:949
+#, 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:988
+msgid "No current branch."
+msgstr "Nessun branch corrente."
+
+#: builtin/merge.c:990
+msgid "No remote for the current branch."
+msgstr "Nessun remote per il branch corrente."
+
+#: builtin/merge.c:992
+msgid "No default upstream defined for the current branch."
+msgstr "Nessun upstream di default definito per il branch corrente."
+
+#: builtin/merge.c:997
+#, 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:1054
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valore errato '%s' nell'ambiente '%s'"
+
+#: builtin/merge.c:1157
+#, 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:1191
+msgid "not something we can merge"
+msgstr "non è qualcosa di cui possiamo eseguire il merge"
+
+#: builtin/merge.c:1295
+msgid "--abort expects no arguments"
+msgstr "--abort non richiede argomenti"
+
+#: builtin/merge.c:1299
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)."
+
+#: builtin/merge.c:1317
+msgid "--quit expects no arguments"
+msgstr "--quit non richiede argomenti"
+
+#: builtin/merge.c:1330
+msgid "--continue expects no arguments"
+msgstr "--continue non richiede argomenti"
+
+#: builtin/merge.c:1334
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)."
+
+#: builtin/merge.c:1350
+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:1357
+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:1360
+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:1374
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Non è possibile combinare --squash con --no-ff."
+
+#: builtin/merge.c:1376
+msgid "You cannot combine --squash with --commit."
+msgstr "Non è possibile combinare --squash con --commit."
+
+#: builtin/merge.c:1392
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato."
+
+#: builtin/merge.c:1409
+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:1411
+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:1416
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - non è qualcosa per cui possiamo eseguire il merge"
+
+#: builtin/merge.c:1418
+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:1499
+msgid "refusing to merge unrelated histories"
+msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
+
+#: builtin/merge.c:1508
+msgid "Already up to date."
+msgstr "Già aggiornato."
+
+#: builtin/merge.c:1518
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Aggiornamento di %s..%s\n"
+
+#: builtin/merge.c:1564
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Provo con un merge veramente banale dentro l'indice...\n"
+
+#: builtin/merge.c:1571
+#, c-format
+msgid "Nope.\n"
+msgstr "No.\n"
+
+#: builtin/merge.c:1596
+msgid "Already up to date. Yeeah!"
+msgstr "Già aggiornato. Oh sì!"
+
+#: builtin/merge.c:1602
+msgid "Not possible to fast-forward, aborting."
+msgstr "Fast forward non possibile, interrompo l'operazione."
+
+#: builtin/merge.c:1630 builtin/merge.c:1695
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Ripristino l'albero in uno stato pulito...\n"
+
+#: builtin/merge.c:1634
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Tentativo con la strategia di merge %s...\n"
+
+#: builtin/merge.c:1686
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Nessuna strategia di merge ha gestito il merge.\n"
+
+#: builtin/merge.c:1688
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Merge con la strategia %s fallito.\n"
+
+#: builtin/merge.c:1697
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Uso %s per preparare una risoluzione manuale.\n"
+
+#: builtin/merge.c:1711
+#, 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 +16982,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"
@@ -16880,7 +17084,7 @@
msgid "Renaming %s to %s\n"
msgstr "Rinominazione di %s in %s in corso\n"
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "rinomina di '%s' non riuscita"
@@ -17073,7 +17277,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 +17515,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 +17533,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:164
msgid "do not remove, show only"
msgstr "non rimuovere, limitati a visualizzare"
@@ -17345,125 +17549,125 @@
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:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "sottocomando sconosciuto: %s"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opzioni>...] [< <elenco riferimenti> | < <elenco "
"oggetti>]"
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < "
"<elenco oggetti>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, 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:442
#, c-format
msgid "corrupt packed object for %s"
msgstr "oggetto sottoposto a pack %s corrotto"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:573
#, 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:784
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u oggetti ordinati, attesi %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:973
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:986
msgid "Writing objects"
msgstr "Scrittura degli oggetti in corso"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 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:1100
#, 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:1298
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:1725
#, 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:1734
#, 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:2005
msgid "Counting objects"
msgstr "Conteggio degli oggetti in corso"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, 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:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, 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:2223 builtin/pack-objects.c:2250
#, 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:2260
msgid "suboptimal pack - out of memory"
msgstr "pack subottimo - memoria esaurita"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, 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:2714
#, 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:2802
msgid "Compressing objects"
msgstr "Compressione oggetti in corso"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr "inconsistenza con il numero dei delta"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17472,7 +17676,7 @@
"atteso ID oggetto arco, ricevuti dati errati:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17481,234 +17685,234 @@
"atteso ID oggetto, ricevuti dati errati:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
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:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr "impossibile aprire l'indice pack"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, 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:3168
msgid "unable to force loose object"
msgstr "impossibile forzare l'oggetto sciolto"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' non è una revisione"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr "revisione '%s' errata"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr "impossibile aggiungere gli oggetti recenti"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr "versione %s di index non supportata"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr "versione '%s' di index errata"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr "<versione>[,<offset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
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:3388
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:3390
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:3392
msgid "ignore packed objects"
msgstr "ignora gli oggetti sottoposti a pack"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
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:3396
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:3398
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:3400
msgid "reuse existing deltas"
msgstr "riusa i delta esistenti"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr "riusa gli oggetti esistenti"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr "usa oggetti OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
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:3408
msgid "do not create an empty pack output"
msgstr "non creare un output pack vuoto"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3410
msgid "read revision arguments from standard input"
msgstr "leggi gli argomenti revisione dallo standard input"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3412
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:3415
msgid "include objects reachable from any reference"
msgstr "includi gli oggetti raggiungibili da qualunque riferimento"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3418
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:3421
msgid "include objects referred to by the index"
msgstr "includi gli oggetti referenziati dall'indice"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3424
msgid "output pack to stdout"
msgstr "invia il pack in output sullo standard output"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
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:3428
msgid "keep unreachable objects"
msgstr "mantieni gli oggetti non raggiungibili"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr "esegui il pack degli oggetti non raggiungibili sciolti"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
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:3435
msgid "use the sparse reachability algorithm"
msgstr "usa l'algoritmo di raggiungibilità sparse"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr "crea pack thin"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
msgid "create packs suitable for shallow fetches"
msgstr "crea pack adatti per fetch shallow"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3441
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:3443
msgid "ignore this pack"
msgstr "ignora questo pack"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr "livello compressione pack"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr "non nascondere i commit innestati"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
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:3451
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:3455
msgid "write a bitmap index if possible"
msgstr "scrivi un indice bitmap se possibile"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3459
msgid "handling for missing objects"
msgstr "azione da eseguire sugli oggetti mancanti"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
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:3464
msgid "respect islands during delta compression"
msgstr "rispetta le isole durante la compressione delta"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3493
#, 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:3498
#, 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:3552
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:3554
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:3559
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:3562
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:3568
msgid "cannot use --filter without --stdout"
msgstr "impossibile usare --filter senza --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
msgid "Enumerating objects"
msgstr "Enumerazione degli oggetti in corso"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17729,31 +17933,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 +17967,74 @@
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:478 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:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"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:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17812,14 +18042,14 @@
"Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti "
"appena recuperati."
-#: builtin/pull.c:428
+#: builtin/pull.c:461
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:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17827,7 +18057,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:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17839,44 +18069,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:470 builtin/rebase.c:1234 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:472 builtin/pull.c:487 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:474 builtin/pull.c:489 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:475 builtin/pull.c:490
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:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: 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:485 builtin/rebase.c:1232 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:494 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:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17886,32 +18116,28 @@
"il merge con il riferimento '%s' del remoto, ma un tale\n"
"riferimento non è stato recuperato."
-#: builtin/pull.c:576
+#: builtin/pull.c:610
#, c-format
msgid "unable to access commit %s"
msgstr "impossibile accedere al commit %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
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:955
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:959
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "eseguine il commit o lo stash."
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17923,7 +18149,7 @@
"Eseguo il fast forward dell'albero\n"
"di lavoro dal commit %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17942,15 +18168,15 @@
"$ git reset --hard\n"
"per eseguire il ripristino."
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
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:1010
msgid "Cannot rebase onto multiple branches."
msgstr "Impossibile eseguire il rebase su più branch."
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossibile eseguire il rebase se ci sono delle modifiche registrate "
@@ -18116,12 +18342,12 @@
"puntare a un oggetto diverso da un commit senza usare l'opzione\n"
"'--force'.\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "Push su %s in corso\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "push di alcuni riferimenti su '%s' non riuscito"
@@ -18150,66 +18376,66 @@
msgid "force updates"
msgstr "forza gli aggiornamenti"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr "<nome riferimento>:<valore atteso>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr ""
"richiedi che il vecchio valore del riferimento corrisponda a questo valore"
-#: builtin/push.c:556
+#: builtin/push.c:555
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:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "usa un thin pack"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "programma ricezione pack"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "set upstream for git pull/status"
msgstr "imposta l'upstream per git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "prune locally removed refs"
msgstr "elimina i riferimenti rimossi localmente"
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr "ignora l'hook pre-push"
-#: builtin/push.c:567
+#: builtin/push.c:565
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:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "firma il push con GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "richiedi l'atomicità della transazione al remoto"
-#: builtin/push.c:590
+#: builtin/push.c:587
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:589
msgid "--delete doesn't make sense without any refs"
msgstr "--delete non ha senso senza alcun ref"
-#: builtin/push.c:612
+#: builtin/push.c:609
#, c-format
msgid "bad repository '%s'"
msgstr "repository '%s' errato"
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18231,27 +18457,27 @@
"\n"
" git push <nome>\n"
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr "--all e --tags non sono compatibili"
-#: builtin/push.c:630
+#: builtin/push.c:627
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:631
msgid "--mirror and --tags are incompatible"
msgstr "--mirror e --tags non sono compatibili"
-#: builtin/push.c:636
+#: builtin/push.c:633
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:636
msgid "--all and --mirror are incompatible"
msgstr "--all e --mirror non sono compatibili"
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr "le opzioni push non devono avere caratteri di fine riga"
@@ -18384,7 +18610,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 +18618,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:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "elenco todo inutilizzabile: '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "impossibile creare un %s temporaneo"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "impossibile contrassegnare come interattivo"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "impossibile generare l'elenco todo"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
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:468
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:481 builtin/rebase.c:1374
+msgid "keep commits which start empty"
+msgstr "mantieni i commit che iniziano vuoti"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "consenti commit con messaggi vuoti"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr "esegui il rebase dei commit di merge"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr "mantieni i punti di branch originali dei cugini"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr "sposta i commit che iniziano con squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr "firma i commit"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
msgid "display a diffstat of what changed upstream"
msgstr "visualizza un diffstat delle modifiche upstream"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:496
msgid "continue rebase"
msgstr "continua il rebase"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "salta il commit"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "modifica l'elenco todo"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "visualizza la patch corrente"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr "abbrevia gli ID dei commit nell'elenco todo"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr "espandi gli ID dei commit nell'elenco todo"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr "controlla l'elenco todo"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr "ridisponi le righe fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "inserisci i comandi exec nell'elenco todo"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "su"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "revisioni-limite"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "limita la revisione"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "squash-su"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "esegui lo squash su"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "il commit upstream"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "nome head"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "nome head"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "strategia di rebase"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "opzioni strategia"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "opzioni strategia"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "passa a"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
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:533
msgid "onto-name"
msgstr "nome"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "sul nome"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "comando"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "il comando da eseguire"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
msgid "automatically re-schedule any `exec` that fails"
msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:553
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:569
#, 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
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossibile ottenere 'onto': '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head non valida: '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, 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:799 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18620,7 +18832,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:882
#, c-format
msgid ""
"\n"
@@ -18639,7 +18851,7 @@
"\n"
"Di conseguenza, Git non può eseguirne il rebase."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18648,7 +18860,7 @@
"tipo vuoto '%s' non riconosciuto; i valori validi sono \"drop\", \"keep\" e "
"\"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -18665,7 +18877,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18679,139 +18891,139 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
msgid "exec commands cannot contain newlines"
msgstr "i comandi exec non possono contenere caratteri di fine riga"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1276
msgid "empty exec command"
msgstr "comando exec vuoto"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
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:1307
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:1309
msgid "allow pre-rebase hook to run"
msgstr "consenti l'esecuzione dell'hook pre-rebase"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1311
msgid "be quiet. implies --no-stat"
msgstr "sii silenzioso. implica --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
msgid "do not show diffstat of what changed upstream"
msgstr "non visualizzare un diffstat delle modifiche upstream"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1320
msgid "add a Signed-off-by: line to each commit"
msgstr "aggiungi una riga Signed-off-by: a ogni commit"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr "passato a 'git am'"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr "passato a 'git apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
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:1339
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr "salta la patch corrente e continua"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
msgstr "interrompi ed esegui il checkout del branch originario"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
msgid "abort but keep HEAD where it is"
msgstr "interrompi ma mantieni l'HEAD dov'è"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1348
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:1351
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:1354
msgid "use apply strategies to rebase"
msgstr "usa le strategie di apply per eseguire il rebase"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr "usa le strategie di merge per eseguire il rebase"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
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:1366
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:1371
msgid "how to handle commits that become empty"
msgstr "come gestire i commit che diventano vuoti"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
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:1385
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:1389
msgid "allow rebasing commits with empty messages"
msgstr "consenti il rebase di commit con messaggi vuoti"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
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:1396
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:1398
msgid "use the given merge strategy"
msgstr "usa la strategia di merge specificata"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
msgid "option"
msgstr "opzione"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argomento alla strategia di merge"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1404
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:1409
+msgid "apply all changes, even those already present upstream"
+msgstr "applica tutte le modifiche, anche quelle già presenti upstream"
+
+#: builtin/rebase.c:1426
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18819,37 +19031,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:1432
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:1473
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:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "impossibile combinare '--keep-base' con '--onto'"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
msgid "cannot combine '--keep-base' with '--root'"
msgstr "impossibile combinare '--keep-base' con '--root'"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "impossibile combinare '--root' con '--fork-point'"
+
+#: builtin/rebase.c:1487
msgid "No rebase in progress?"
msgstr "Nessun rebase in corso?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1491
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:1514
msgid "Cannot read HEAD"
msgstr "Impossibile leggere l'HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18858,16 +19074,16 @@
"quindi contrassegnarli come risolti usando\n"
"git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1545
msgid "could not discard worktree changes"
msgstr "impossibile scartare le modifiche all'albero di lavoro"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr "impossibile ritornare a %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18888,169 +19104,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:1638
msgid "switch `C' expects a numerical value"
msgstr "l'opzione `C` richiede un valore numerico"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo sconosciuto: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy richiede --merge o --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
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:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend di rebase sconosciuto: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec richiede --exec o --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1794
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:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream non valido: '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr "Impossibile creare il nuovo commit radice"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, 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:1853
#, 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:1861
#, 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:1887
#, 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/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "Riferimento non esistente: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
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:1927
msgid "Please commit or stash them."
msgstr "Eseguine il commit o lo stash."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr "impossibile passare a %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr "HEAD è aggiornato."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, 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:1984
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD è aggiornato, forzo il rebase."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, 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:1994
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:2001
#, c-format
msgid "Changes to %s:\n"
msgstr "Modifiche a %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Modifiche da %s a %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, 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:2038
msgid "Could not detach HEAD"
msgstr "Impossibile scollegare l'HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, 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:843
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 +19276,7 @@
"il comportamento predefinito, imposta la variabile di\n"
"configurazione 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:863
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 +19299,11 @@
"Per non visualizzare più questo messaggio, puoi impostarla a\n"
"'refuse'."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1960
msgid "quiet"
msgstr "non visualizzare messaggi"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr "Devi specificare una directory."
@@ -19698,11 +19891,11 @@
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,118 +19904,118 @@
"Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n"
"pack.writebitmaps."
-#: builtin/repack.c:191
+#: builtin/repack.c:193
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:232 builtin/repack.c:418
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:256
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:294
msgid "pack everything in a single pack"
msgstr "esegui il pack di tutto in un singolo pack"
-#: builtin/repack.c:294
+#: builtin/repack.c:296
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:299
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:301
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:303
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:305
msgid "do not run git-update-server-info"
msgstr "non eseguire git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "fornisci l'opzione --local a git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "scrivi l'indice bitmap"
-#: builtin/repack.c:310
+#: builtin/repack.c:312
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:313
msgid "approxidate"
msgstr "data approssimativa"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
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:316
msgid "with -a, repack unreachable objects"
msgstr "con -a, esegui il repack degli oggetti non raggiungibili"
-#: builtin/repack.c:316
+#: builtin/repack.c:318
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:319 builtin/repack.c:325
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:318
+#: builtin/repack.c:320
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:322
msgid "limits the maximum delta depth"
msgstr "limita la profondità massima dei delta"
-#: builtin/repack.c:322
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "limita il numero massimo di thread"
-#: builtin/repack.c:324
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "dimensione massima di ogni file pack"
-#: builtin/repack.c:326
+#: builtin/repack.c:328
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:330
msgid "do not repack this pack"
msgstr "non eseguire il repack di questo pack"
-#: builtin/repack.c:338
+#: builtin/repack.c:340
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:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable e -A non sono compatibili"
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "Non ci sono oggetti nuovi di cui eseguire il pack."
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -19842,7 +20035,7 @@
"AVVISO: non è riuscito. Ridenominali manualmente\n"
"AVVISO: entro %s:\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "eliminazione di '%s' non riuscita"
@@ -20155,92 +20348,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 +20447,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 +20472,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"
@@ -20503,15 +20696,15 @@
msgid "remote name"
msgstr "nome remoto"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "usa protocollo RPC senza stato"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "leggi i riferimento dallo standard input"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "stampa lo stato dell'helper remoto"
@@ -20738,8 +20931,8 @@
"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
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
@@ -20747,62 +20940,50 @@
"questo albero di lavoro non è sparse (il file sparse-checkout potrebbe non "
"esistere)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:212
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:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "impostazione dell'opzione extensions.worktreeConfig non riuscita"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
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:326
#, c-format
msgid "failed to open '%s'"
msgstr "apertura di '%s' non riuscita"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, c-format
msgid "could not normalize path %s"
msgstr "impossibile normalizzare il percorso '%s'"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:395
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:420
#, 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:474 builtin/sparse-checkout.c:498
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:543
msgid "read patterns from standard in"
msgstr "leggi i pattern dallo standard input"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "imposta i pattern sparse-checkout"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "disabilita sparse-checkout"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "errore durante l'aggiornamento della directory di lavoro"
@@ -20882,7 +21063,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 +21072,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 +21102,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 +21125,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:1475 builtin/stash.c:1540
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:1046
msgid "No changes selected"
msgstr "Nessuna modifica selezionata"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
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:1173
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:1182
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:1193 builtin/stash.c:1202
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:1230
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:1279
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:1295
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:1310
msgid "No local changes to save"
msgstr "Nessuna modifica locale da salvare"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr "Impossibile inizializzare stash"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "Impossibile salvare lo stato attuale"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, 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:1427
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:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "mantieni l'indice"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "esegui lo stash in modalità patch"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "modalità silenziosa"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
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:1473 builtin/stash.c:1538
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:1573
+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]"
@@ -21501,17 +21684,25 @@
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:2241 git-submodule.sh:176
#, 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:2257
+msgid "Suppress output for setting url of a submodule"
+msgstr "Non visualizzare l'output dell'impostazione dell'URL del sottomodulo"
+
+#: builtin/submodule--helper.c:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <percorso> <nuovo URL>"
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s non supporta --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2329
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' non è un sottocomando submodule--helper valido"
@@ -21538,11 +21729,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"
@@ -21636,135 +21827,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 +22251,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"
@@ -22166,7 +22357,7 @@
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:894
#, c-format
msgid "failed to delete '%s'"
msgstr "eliminazione di '%s' non riuscita"
@@ -22247,124 +22438,124 @@
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:435 builtin/worktree.c:441
#, 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:437
#, 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:446
#, 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:452
#, 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:493
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:496
msgid "create a new branch"
msgstr "crea un nuovo branch"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "crea o reimposta un branch"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "popola il nuovo albero di lavoro"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "mantieni bloccato il nuovo albero di lavoro"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
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:507
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:515
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:576
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:676
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:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, 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:690 builtin/worktree.c:723
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:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' è già bloccato per questo motivo: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' è già bloccato"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' non è bloccato"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
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:774
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:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' è un albero di lavoro principale"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossibile determinare il nome destinazione da '%s'"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr "la destinazione '%s' esiste già"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22374,7 +22565,7 @@
"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22383,37 +22574,37 @@
"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:821
#, 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:826
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "spostamento di '%s' in '%s' non riuscito"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:874
#, 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:878
#, 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:883
#, 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:906
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:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22423,7 +22614,7 @@
"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22432,7 +22623,7 @@
"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s"
@@ -22453,17 +22644,126 @@
msgid "only useful for debugging"
msgstr "utile solo per il debug"
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr "versione di git:\n"
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() non riuscita: errore '%s' (%d)\n"
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr "informazioni sul compilatore: "
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr "informazioni su libc: "
+
+#: bugreport.c:74
+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"
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <formato>]"
+
+#: bugreport.c:91
+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"
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr ""
+"specifica una destinazione per il file contenente la segnalazione d'errore"
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr "specifica un suffisso in formato strftime per il nome del file"
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "impossibile creare le prime directory per '%s'"
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr "Informazioni di sistema"
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr "Hook abilitati"
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "impossibile creare un nuovo file in '%s'"
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Nuovo report creato in '%s'.\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Contrassegni Da mancanti per il sottomodulo '%s'"
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Contrassegni A mancanti per il sottomodulo '%s'"
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Atteso comando 'mark', ricevuto %s"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Atteso comando 'to', ricevuto %s"
-#: fast-import.c:3254
+#: fast-import.c:3317
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+"Per l'opzione riscrittura sottomodulo ci si attendeva un formato nome:nomefile"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "funzionalità '%s' vietata nell'input senza --allow-unsafe-features"
@@ -22503,7 +22803,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 +22821,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 +22834,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:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "durante l'espansione dell'alias '%s': '%s'"
-#: git.c:369
+#: git.c:371
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22583,39 +22883,39 @@
"l'alias '%s' modifica le variabili d'ambiente.\n"
"Puoi usare '!git' nell'alias per farlo"
-#: git.c:376
+#: git.c:378
#, c-format
msgid "empty alias for %s"
msgstr "alias vuoto per %s"
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr "alias ricorsivo: %s"
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr "errore di scrittura sullo standard output"
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr "errore di scrittura sconosciuto sullo standard output"
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr "chiusura dello standard output non riuscita"
-#: git.c:793
+#: git.c:792
#, 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:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "impossibile gestire %s come comando incorporato"
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
@@ -22624,55 +22924,55 @@
"uso: %s\n"
"\n"
-#: git.c:876
+#: git.c:875
#, 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:887
#, 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:914
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:993
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:1139
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:"
-#: http.c:1093
+#: http.c:1146
#, 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:1150
#, 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:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22800,6 +23100,14 @@
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git"
+#: 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:85
msgid "args"
msgstr "argomenti"
@@ -22857,11 +23165,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,639 +23212,645 @@
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 "Join two or more development histories together"
msgstr "Unisce due o più cronologie di sviluppo"
-#: command-list.h:122
+#: command-list.h:123
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:124
msgid "Run a three-way file merge"
msgstr "Esegue un merge a tre vie su file"
-#: command-list.h:124
+#: command-list.h:125
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:126
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:127
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:128
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:129
msgid "Write and verify multi-pack-indexes"
msgstr "Scrive e verifica indici multi-pack"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "Crea un oggetto tag"
-#: command-list.h:130
+#: command-list.h:131
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:132
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:133
msgid "Find symbolic names for given revs"
msgstr "Trova i nomi simbolici per le revisioni date"
-#: command-list.h:133
+#: command-list.h:134
msgid "Add or inspect object notes"
msgstr "Aggiunge o esamina le note agli oggetti"
-#: command-list.h:134
+#: command-list.h:135
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:136
msgid "Create a packed archive of objects"
msgstr "Crea un archivio di oggetti sottoposto a pack"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "Trova file pack ridondanti"
-#: command-list.h:137
+#: command-list.h:138
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:139
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:140
msgid "Compute unique ID for a patch"
msgstr "Calcola l'ID univoco per una patch"
-#: command-list.h:140
+#: command-list.h:141
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:142
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:143
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:144
msgid "Update remote refs along with associated objects"
msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
-#: command-list.h:144
+#: command-list.h:145
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:146
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:147
msgid "Reads tree information into the index"
msgstr "Legge le informazioni su un albero dall'indice"
-#: command-list.h:147
+#: command-list.h:148
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:149
msgid "Receive what is pushed into the repository"
msgstr "Riceve quanto sottoposto a push nel repository"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Gestisce le informazioni del registro dei riferimenti"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Gestisce l'insieme dei repository tracciati"
-#: command-list.h:151
+#: command-list.h:152
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:153
msgid "Create, list, delete refs to replace objects"
msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
-#: command-list.h:153
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Genera un riassunto delle modifiche in sospeso"
-#: command-list.h:154
+#: command-list.h:155
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:156
msgid "Reset current HEAD to the specified state"
msgstr "Ripristina l'HEAD corrente allo stato specificato"
-#: command-list.h:156
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Ripristina i file nell'albero di lavoro"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "Esegue il revert di alcuni commit esistenti"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Sceglie e altera i parametri"
-#: command-list.h:160
+#: command-list.h:161
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:162
msgid "Send a collection of patches as emails"
msgstr "Invia un insieme di patch come e-mail"
-#: command-list.h:162
+#: command-list.h:163
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:164
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:165
msgid "Summarize 'git log' output"
msgstr "Riassume l'output di 'git log'"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "Visualizza vari tipi di oggetti"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "Visualizza i branch e i loro commit"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "Visualizza l'indice di un archivio sottoposto a pack"
-#: command-list.h:168
+#: command-list.h:169
msgid "List references in a local repository"
msgstr "Elenca i riferimenti in un repository locale"
-#: command-list.h:169
+#: command-list.h:170
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:171
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:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Inizializza e modifica sparse-checkout"
-#: command-list.h:172
+#: command-list.h:173
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:174
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:175
msgid "Show the working tree status"
msgstr "Visualizza lo stato dell'albero di lavoro"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Rimuove spazi bianchi non necessari"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Inizializza, aggiorna o esamina sottomoduli"
-#: command-list.h:177
+#: command-list.h:178
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:179
msgid "Switch branches"
msgstr "Passa da un branch a un altro"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Legge, modifica ed elimina riferimenti simbolici"
-#: command-list.h:180
+#: command-list.h:181
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:182
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:183
msgid "Unpack objects from a packed archive"
msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
-#: command-list.h:183
+#: command-list.h:184
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:185
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:186
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:187
msgid "Send archive back to git-archive"
msgstr "Reinvia l'archivio a git-archive"
-#: command-list.h:187
+#: command-list.h:188
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:189
msgid "Show a Git logical variable"
msgstr "Visualizza una variabile logica di Git"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Verifica la firma GPG dei commit"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Convalida i file archivio sottoposti a pack di Git"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Verifica la firma GPG dei tag"
-#: command-list.h:192
+#: command-list.h:193
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:194
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:195
msgid "Manage multiple working trees"
msgstr "Gestisce alberi di lavoro multipli"
-#: command-list.h:195
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "Crea un oggetto albero dall'indice corrente"
-#: command-list.h:196
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Definizione di attributi per percorso"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Interfaccia a riga di comando di Git e convenzioni"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Un tutorial Git di base per gli sviluppatori"
-#: command-list.h:199
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git per utenti CVS"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Messa a punto dell'output di diff"
-#: command-list.h:201
+#: command-list.h:202
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:203
msgid "A Git Glossary"
msgstr "Un glossario di Git"
-#: command-list.h:203
+#: command-list.h:204
msgid "Hooks used by Git"
msgstr "Hook usati da Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifies intentionally untracked files to ignore"
msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
-#: command-list.h:205
+#: command-list.h:206
msgid "Defining submodule properties"
msgstr "Definizione proprietà sottomodulo"
-#: command-list.h:206
+#: command-list.h:207
msgid "Git namespaces"
msgstr "Spazi dei nomi Git"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git Repository Layout"
msgstr "Struttura repository Git"
-#: command-list.h:208
+#: command-list.h:209
msgid "Specifying revisions and ranges for Git"
msgstr "Come specificare revisioni e intervalli in Git"
-#: command-list.h:209
+#: command-list.h:210
msgid "Mounting one repository inside another"
msgstr "Monto un repository dentro un altro"
-#: command-list.h:210
+#: command-list.h:211
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial introduttivo per Git: seconda parte"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git"
msgstr "Un tutorial introduttivo per Git"
-#: command-list.h:212
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr "Una panoramica dei flussi di lavoro raccomandati in Git"
@@ -23580,20 +23894,20 @@
msgid "cannot read $file for replaying"
msgstr "impossibile leggere $file per rieseguire i comandi contenuti"
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr "?? di cosa stai parlando?"
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr "esecuzione di bisect non riuscita: nessun comando fornito."
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr "esecuzione di $command in corso"
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23602,11 +23916,11 @@
"esecuzione di bisect non riuscita:\n"
"il codice di uscita $res da '$command' è < 0 oppure >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr "l'esecuzione di bisect non può più proseguire"
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23615,11 +23929,11 @@
"esecuzione di bisect non riuscita:\n"
"'bisect_state $state' è uscito con il codice di errore $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr "esecuzione di bisect completata con successo"
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr "Non stiamo eseguendo una bisezione."
@@ -23663,133 +23977,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:205
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:215
#, 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:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' esiste già nell'indice"
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, 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:244
#, 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:275
#, 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:277
#, 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:285
#, 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:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23806,39 +24037,39 @@
"altro\n"
"nome con l'opzione '--name'."
-#: git-submodule.sh:291
+#: git-submodule.sh:293
#, 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:305
#, 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:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita"
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Registrazione del sottomodulo '$sm_path' non riuscita"
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, 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:602
#, 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:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23847,7 +24078,7 @@
"Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel "
"percorso del sottomodulo '$sm_path'"
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23856,7 +24087,7 @@
"Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; "
"provo a recuperare direttamente $sha1:"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23865,79 +24096,79 @@
"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:638
#, 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:639
#, 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:643
#, 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:644
#, 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:649
#, 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:650
#, 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:655
#, 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:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita"
-#: git-submodule.sh:896
+#: git-submodule.sh:878
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opzione --cached non può essere usata con l'opzione --files"
-#: git-submodule.sh:948
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modalità $mod_dst inattesa"
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attenzione: $display_name non contiene il commit $sha1_src"
-#: git-submodule.sh:971
+#: git-submodule.sh:953
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attenzione: $display_name non contiene il commit $sha1_dst"
-#: git-submodule.sh:974
+#: git-submodule.sh:956
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -23957,6 +24188,16 @@
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)"
@@ -25052,6 +25293,135 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Inviare %s? [y|N]: "
+#, 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}"
@@ -25400,9 +25770,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/sv.po b/po/sv.po
index 06a586a..09a58a3 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>
# 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-2020.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.26.0\n"
+"Project-Id-Version: git 2.27.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: 2020-05-15 09:11+0800\n"
+"PO-Revision-Date: 2020-05-15 12:20+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,16 +16,16 @@
"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
#, 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:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
msgid "could not read index"
msgstr "kunde inte läsa indexet"
@@ -53,8 +53,7 @@
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:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
msgstr "kunde inte skriva indexet"
@@ -70,8 +69,8 @@
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:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
@@ -194,11 +193,11 @@
msgid "(empty) select nothing"
msgstr "(tomt) markera ingenting"
-#: 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:1851
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: 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:1848
msgid "What now"
msgstr "Vad nu"
@@ -210,12 +209,13 @@
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
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr "sökväg"
@@ -223,27 +223,27 @@
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:1157 builtin/clean.c:781 git-add--interactive.perl:1765
#, 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:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Köa stycket [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -251,7 +251,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att köas "
"omedelbart."
-#: add-patch.c:40
+#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -265,22 +265,22 @@
"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:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -288,7 +288,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "
"i \"stash\" omedelbart."
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -302,22 +302,22 @@
"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:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -325,7 +325,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:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -339,22 +339,22 @@
"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:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -362,7 +362,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
"för applicering omedelbart."
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -376,25 +376,25 @@
"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
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -402,7 +402,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:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -416,22 +416,22 @@
"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:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -445,22 +445,22 @@
"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:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -474,7 +474,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:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -488,34 +488,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:319
#, 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:338 add-patch.c:342
#, 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:396
msgid "could not parse diff"
msgstr "kunde inte tolka diff"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "kunde inte tolka färgad diff"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "misslyckades att köra \"%s\""
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "omaka utdata från interactive.diffFilter"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -523,7 +523,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:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -532,7 +532,7 @@
"förväntade sammanhangsrad %d i\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -545,11 +545,11 @@
"\tavslutas inte med:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -563,7 +563,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:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -573,11 +573,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:1104
msgid "could not parse hunk header"
msgstr "kunde inte tolka styckehuvud"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "\"git apply --cached\" misslyckades"
@@ -700,47 +700,56 @@
msgid "'git apply' failed"
msgstr "\"git apply\" misslyckades"
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Slå av meddelandet med \"git config advice.%s false\""
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%stips: %.*s%s\n"
-#: advice.c:168
+#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:178
+#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c: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."
@@ -748,23 +757,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:273
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:278 builtin/merge.c:1353
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:201
+#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1056,7 +1065,7 @@
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:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
@@ -1253,7 +1262,7 @@
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:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
@@ -1319,7 +1328,7 @@
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:4973 builtin/am.c:2259
msgid "num"
msgstr "antal"
@@ -1375,7 +1384,7 @@
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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
@@ -1383,9 +1392,9 @@
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:5008 builtin/am.c:2238 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:3458 builtin/rebase.c:1332
msgid "action"
msgstr "åtgärd"
@@ -1414,8 +1423,8 @@
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
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "var pratsam"
@@ -1427,7 +1436,7 @@
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:5032 builtin/am.c:2247
msgid "root"
msgstr "rot"
@@ -1435,142 +1444,6 @@
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
-
-#: 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 <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
-"[<sökväg>...]"
-
-#: archive.c:17
-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"
@@ -1610,7 +1483,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
@@ -1620,6 +1493,142 @@
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>...]"
+
+#: 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 <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
+"[<sökväg>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
+
+#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
+
+#: archive.c:401
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "ingen sådan referens: %.*s"
+
+#: archive.c:407
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "objektnamnet är inte giltigt: %s"
+
+#: archive.c:420
+#, c-format
+msgid "not a tree object: %s"
+msgstr "inte ett trädobjekt: %s"
+
+#: archive.c:432
+msgid "current working directory is untracked"
+msgstr "aktuell arbetskatalog är inte spårad"
+
+#: archive.c:464
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:464
+msgid "archive format"
+msgstr "arkivformat"
+
+#: archive.c:465 builtin/log.c:1674
+msgid "prefix"
+msgstr "prefix"
+
+#: archive.c:466
+msgid "prepend prefix to each pathname in the archive"
+msgstr "lägg till prefix till varje sökväg i arkivet"
+
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "fil"
+
+#: archive.c:468 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "skriv arkivet till filen"
+
+#: archive.c:470
+msgid "read .gitattributes in working directory"
+msgstr "läs .gitattributes i arbetskatalogen"
+
+#: archive.c:471
+msgid "report archived files on stderr"
+msgstr "rapportera arkiverade filer på standard fel"
+
+#: archive.c:472
+msgid "store only"
+msgstr "endast spara"
+
+#: archive.c:473
+msgid "compress faster"
+msgstr "komprimera snabbare"
+
+#: archive.c:481
+msgid "compress better"
+msgstr "komprimera bättre"
+
+#: archive.c:484
+msgid "list supported archive formats"
+msgstr "visa understödda arkivformat"
+
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "arkiv"
+
+#: archive.c:487 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "hämta arkivet från fjärrarkivet <arkiv>"
+
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "kommando"
+
+#: archive.c:489 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:496
+msgid "Unexpected option --remote"
+msgstr "Oväntad flagga --remote"
+
+#: archive.c:498
+msgid "Option --exec can only be used together with --remote"
+msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#: archive.c:500
+msgid "Unexpected option --output"
+msgstr "Oväntad flagga --output"
+
+#: archive.c:522
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Okänt arkivformat \"%s\""
+
+#: archive.c:529
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
+
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1713,12 +1722,12 @@
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:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
@@ -1758,41 +1767,41 @@
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
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
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,12 +1939,12 @@
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"
@@ -1950,8 +1959,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -2003,7 +2012,7 @@
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:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
@@ -2026,18 +2035,297 @@
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:183
+msgid "commit-graph file is too small"
+msgstr "incheckningsgraffilen %s är för liten"
+
+#: commit-graph.c:248
+#, 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:255
+#, 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:262
+#, 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:284
+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:294
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
+
+#: commit-graph.c:436
+msgid "commit-graph has no base graphs chunk"
+msgstr "incheckningsgrafen har inga bas-graf-stycken"
+
+#: commit-graph.c:446
+msgid "commit-graph chain does not match"
+msgstr "incheckningsgrafens kedja stämmer inte"
+
+#: commit-graph.c:494
+#, 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:518
+msgid "unable to find all commit-graph files"
+msgstr "kan inte hitta alla incheckingsgraffiler"
+
+#: commit-graph.c:651 commit-graph.c:711
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
+
+#: commit-graph.c:672
+#, c-format
+msgid "could not find commit %s"
+msgstr "kunde inte hitta incheckningen %s"
+
+#: commit-graph.c:948 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr "Skriver Bloom-filterindex för ändrade sökvägar"
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr "Skriver Bloom-filterdata för ändrade sökvägar"
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "kunde inte hämta typ för objektet %s"
+
+#: commit-graph.c:1196
+msgid "Loading known commits in commit graph"
+msgstr "Läser in kända incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1213
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1233
+msgid "Clearing commit marks in commit graph"
+msgstr "Rensar incheckningsmärken i incheckningsgraf"
+
+#: commit-graph.c:1252
+msgid "Computing commit graph generation numbers"
+msgstr "Beräknar generationsvärden för incheckningsgraf"
+
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
+
+#: commit-graph.c:1359
+#, 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:1372
+#, c-format
+msgid "error adding pack %s"
+msgstr "fel vid tillägg av paketet %s"
+
+#: commit-graph.c:1376
+#, c-format
+msgid "error opening index for %s"
+msgstr "fel vid öppning av indexet för %s"
+
+#: commit-graph.c:1405
+#, 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:1426
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "ogiltigt inchecknings-objekt-id %s"
+
+#: commit-graph.c:1442
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
+
+#: commit-graph.c:1457
+msgid "Counting distinct commits in commit graph"
+msgstr "Räknar olika incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1489
+msgid "Finding extra edges in commit graph"
+msgstr "Söker ytterligare kanter i incheckingsgraf"
+
+#: commit-graph.c:1538
+msgid "failed to write correct number of base graph ids"
+msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
+
+#: commit-graph.c:1572 midx.c:812
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "kunde inte skapa inledande kataloger för %s"
+
+#: commit-graph.c:1585
+msgid "unable to create temporary graph layer"
+msgstr "kan inte skapa temporärt graflager"
+
+#: commit-graph.c:1590
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "kan inte justera delade behörigheter för \"%s\""
+
+#: commit-graph.c:1667
+#, 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:1712
+msgid "unable to open commit-graph chain file"
+msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
+
+#: commit-graph.c:1728
+msgid "failed to rename base commit-graph file"
+msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
+
+#: commit-graph.c:1748
+msgid "failed to rename temporary commit-graph file"
+msgstr "kunde inte byta namn på temporär incheckningsgraffil"
+
+#: commit-graph.c:1874
+msgid "Scanning merged commits"
+msgstr "Söker sammanslagna incheckningar"
+
+#: commit-graph.c:1885
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "oväntat duplicerat inchecknings-id %s"
+
+#: commit-graph.c:1908
+msgid "Merging commit-graph"
+msgstr "Slår ihop incheckningsgraf"
+
+#: commit-graph.c:2096
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+
+#: commit-graph.c:2107
+msgid "too many commits to write graph"
+msgstr "för många incheckningar för att skriva graf"
+
+#: commit-graph.c:2200
+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:2210
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
+
+#: commit-graph.c:2220 commit-graph.c:2235
+#, 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:2227
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
+
+#: commit-graph.c:2245
+msgid "Verifying commits in commit graph"
+msgstr "Bekräftar incheckningar i incheckningsgrafen"
+
+#: commit-graph.c:2259
+#, 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:2266
+#, 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:2276
+#, 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:2285
+#, 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:2298
+#, 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:2303
+#, 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:2307
+#, 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:2322
+#, 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:2328
+#, 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:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "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 +2345,29 @@
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1168
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1432
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 +2377,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:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2371,296 +2396,296 @@
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
-#: config.c:382
+#: config.c:384
#, 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:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:833
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:837
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:998
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:1001
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:1004
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:1007
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:1010
+#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:1013
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1117
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1208
+#: config.c:1223
#, 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:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3542
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2097
+#: config.c:2113
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2267
+#: config.c:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2312
+#: config.c:2328
#, 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:2374
#, 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:2376
#, 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:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2502
+#: config.c:2518
#, 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:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "kunde inte utföra mmap på \"%s\""
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:2977
+#: config.c:2993
#, 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:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
@@ -2729,7 +2754,7 @@
#: connect.c:445
msgid "expected flush after ref listing"
-msgstr "oväntad \"flush\" efter ref-listan"
+msgstr "förväntade \"flush\" efter ref-listan"
#: connect.c:544
#, c-format
@@ -2826,19 +2851,19 @@
# 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:107 builtin/fsck.c:208 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
@@ -2939,15 +2964,15 @@
msgid "external filter '%s' failed"
msgstr "externt filter \"%s\" misslyckades"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "oväntad filtertyp"
-#: convert.c:850
+#: convert.c:851
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:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -2956,20 +2981,48 @@
"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
"inte har filtrerats"
-#: convert.c:1223
+#: convert.c:1243
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:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
-#: convert.c:1489
+#: convert.c:1511
#, 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:396
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url innehåller radbrytning i komponenten %s: %s"
+
+#: credential.c:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url saknar protokoll: %s"
+
+#: credential.c:513
+#, 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,15 +3115,6 @@
msgid "Marked %d islands, done.\n"
msgstr "Markerade %d öar, klar.\n"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "kunde inte läsa orderfilen \"%s\""
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Utför onöjaktig namnbytesdetektering"
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
@@ -3133,35 +3177,35 @@
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4547
+#: diff.c:4583
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:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4676
+#: diff.c:4712
#, 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
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s förväntar ett numeriskt värde"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3170,42 +3214,42 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, 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:4858
#, 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:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "kunde inte slå upp \"%s\""
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s förväntar formen <n>/<m>"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s förväntar ett tecken, fick \"%s\""
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "felaktigt argument till --color-moved: %s"
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ogiltigt läge %s\" i --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3213,149 +3257,149 @@
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "ogiltigt argument för %s"
-#: diff.c:5178
+#: diff.c:5214
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5234
+#: diff.c:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "felaktigt argument --word-diff: %s"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "Formatflaggor för diff-utdata"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "skapar patch"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "skapa diffar med <n> rader sammanhang"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "generera diff i råformat"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "synonym till \"-p --raw\""
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "synonym till \"-p --stat\""
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "maskinläsbar --stat"
-#: diff.c:5287
+#: diff.c:5323
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:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5326
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:5330
msgid "synonym for --dirstat=cumulative"
msgstr "synonym för --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonym för --dirstat=filer,param1,param2..."
-#: diff.c:5302
+#: diff.c:5338
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-#: diff.c:5305
+#: diff.c:5341
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:5344
msgid "show only names of changed files"
msgstr "visa endast namnen på ändrade filer"
-#: diff.c:5311
+#: diff.c:5347
msgid "show only names and status of changed files"
msgstr "visa endast namn och status för ändrade filer"
-#: diff.c:5313
+#: diff.c:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "skapa diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "<bredd>"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "generera en diffstat med given bredd"
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr "generera en diffstat med given namnbredd"
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr "generera en diffstat med given grafbredd"
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr "<antal>"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "generera diffstat med begränsade rader"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "skapa kompakt översikt i diffstat"
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr "skapa en binärdiff som kan appliceras"
-#: diff.c:5335
+#: diff.c:5371
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:5373
msgid "show colored diff"
msgstr "visa färgad diff"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "<typ>"
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3363,7 +3407,7 @@
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
"\"new\" (nya) rader i diffen"
-#: diff.c:5342
+#: diff.c:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3371,87 +3415,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:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr "visa givet källprefix istället för \"a/\""
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr "visa givet målprefix istället för \"b/\""
-#: diff.c:5352
+#: diff.c:5388
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:5391
msgid "do not show any source or destination prefix"
msgstr "visa inte käll- eller målprefix"
-#: diff.c:5358
+#: diff.c:5394
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:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "<tecken>"
-#: diff.c:5363
+#: diff.c:5399
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:5404
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:5409
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:5412
msgid "Diff rename options"
msgstr "Diff-namnbytesflaggor"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5414
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:5418
msgid "detect renames"
msgstr "detektera namnändringar"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "ta bort för-version för borttagningar"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "detektera kopior"
-#: diff.c:5393
+#: diff.c:5429
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:5431
msgid "disable rename detection"
msgstr "inaktivera detektering av namnbyten"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "använd tomma blob:ar som namnändringskälla"
-#: diff.c:5400
+#: diff.c:5436
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:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3459,159 +3503,159 @@
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
"given gräns"
-#: diff.c:5405
+#: diff.c:5441
msgid "Diff algorithm options"
msgstr "Alternativ för diff-algoritm"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "skapa minsta möjliga diff"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "ignorera blanktecken vid radjämförelse"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "ignorera blanktecken vid radslut"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "ignorera CR-tecken vid radslut"
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr "ignorera ändringar i rader som är helt blanka"
-#: diff.c:5425
+#: diff.c:5461
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristik för att flytta diff-gränser för lättare läsning"
-#: diff.c:5428
+#: diff.c:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "skapa diffar med algoritmen \"patience diff\""
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "skapa diffar med algoritmen \"histogram diff\""
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr "<algoritm>"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "välj en diff-algoritm"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "<text>"
-#: diff.c:5438
+#: diff.c:5474
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "skapa diffar med algoritmen \"anchored diff\""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "<läge>"
-#: diff.c:5441
+#: diff.c:5477
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:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "<reguttr>"
-#: diff.c:5444
+#: diff.c:5480
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:5483
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-#: diff.c:5450
+#: diff.c:5486
msgid "moved lines of code are colored differently"
msgstr "flyttade kodrader färgas på annat sätt"
-#: diff.c:5453
+#: diff.c:5489
msgid "how white spaces are ignored in --color-moved"
msgstr "hur blanktecken ignoreras i --color-moved"
-#: diff.c:5456
+#: diff.c:5492
msgid "Other diff options"
msgstr "Andra diff-flaggor"
-#: diff.c:5458
+#: diff.c:5494
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:5498
msgid "treat all files as text"
msgstr "hantera alla filer som text"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "växla två indatafiler, vänd diffen"
-#: diff.c:5466
+#: diff.c:5502
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "avsluta med 1 vid ändringar, annars 0"
-#: diff.c:5468
+#: diff.c:5504
msgid "disable all output of the program"
msgstr "slå av alla utdata från programmet"
-#: diff.c:5470
+#: diff.c:5506
msgid "allow an external diff helper to be executed"
msgstr "tillåt köra en extern diff-hjälpare"
-#: diff.c:5472
+#: diff.c:5508
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:5510
msgid "<when>"
msgstr "<när>"
-#: diff.c:5475
+#: diff.c:5511
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorera ändringar i undermoduler när diffen skapas"
-#: diff.c:5478
+#: diff.c:5514
msgid "<format>"
msgstr "<format>"
-#: diff.c:5479
+#: diff.c:5515
msgid "specify how differences in submodules are shown"
msgstr "ange hur ändringar i undermoduler visas"
-#: diff.c:5483
+#: diff.c:5519
msgid "hide 'git add -N' entries from the index"
msgstr "dölj \"git add -N\"-poster från indexet"
-#: diff.c:5486
+#: diff.c:5522
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:5524
msgid "<string>"
msgstr "<sträng>"
-#: diff.c:5489
+#: diff.c:5525
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:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3619,60 +3663,69 @@
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
"uttryck"
-#: diff.c:5495
+#: diff.c:5531
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:5534
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:5537
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:5538
msgid "<object-id>"
msgstr "<objekt-id>"
-#: diff.c:5503
+#: diff.c:5539
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:5541
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:5542
msgid "select files by diff type"
msgstr "välj filter efter diff-typ"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "<fil>"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "Skriv utdata till en specifik fil"
-#: diff.c:6164
+#: diff.c:6200
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:6203
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:6206
#, 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."
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "kunde inte läsa orderfilen \"%s\""
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Utför onöjaktig namnbytesdetektering"
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3704,35 +3757,35 @@
msgid "cannot use %s as an exclude file"
msgstr "kan inte använda %s som exkluderingsfil"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "kunde inte öppna katalogen \"%s\""
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2603
+#: dir.c:2699
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:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr "indexfilen trasig i arkivet %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3486
+#: dir.c:3560
#, 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"
@@ -3741,17 +3794,17 @@
msgid "Filtering content"
msgstr "Filtrerar innehåll"
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "felaktig git-namnrymdssökväg \"%s\""
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "kunde inte ställa in GIT_DIR till \"%s\""
@@ -3761,245 +3814,245 @@
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:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:153
+#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
-#: fetch-pack.c:164
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:195
+#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "kunde inte skriva till fjärren"
-#: fetch-pack.c:257
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:357 fetch-pack.c:1364
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:363 fetch-pack.c:1370
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:340
msgid "done"
msgstr "klart"
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:819
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:826
+#: fetch-pack.c:827
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, 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:917
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, 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:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 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:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr "Servern stöder %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr "Servern stöder filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr "kunde inte skriva anrop till fjärren"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1263
+#: fetch-pack.c:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "förväntade bekräftelserad: \"%s\""
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
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:1344
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:1386
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1789
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:1812
+#: fetch-pack.c:1839
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, 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:272
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg misslyckades signera data"
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4018,7 +4071,7 @@
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:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4094,7 +4147,7 @@
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:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "okänd kommandolisttyp \"%s\""
@@ -4103,19 +4156,19 @@
msgid "The common Git guides are:"
msgstr "De vanliga Git-vägledningarna är:"
-#: help.c:512
+#: help.c:427
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:432
msgid "External commands"
msgstr "Externa kommandon"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "Kommadoalias"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4124,32 +4177,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:570
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:592
#, 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:597
#, 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:602
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
-#: help.c:695
+#: help.c:610
#, 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:614
msgid ""
"\n"
"The most similar command is"
@@ -4163,16 +4216,16 @@
"\n"
"Mest lika kommandon är"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4240,36 +4293,11 @@
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:436 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
-
-#: 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>\""
@@ -4296,7 +4324,32 @@
msgid "multiple filter-specs cannot be combined"
msgstr "flera filterspecifikationer kan inte kombineras"
-#: lockfile.c:151
+#: 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"
+msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
+
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4316,20 +4369,14 @@
"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"
-
-#: 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:109
+msgid "expected flush after ls-refs arguments"
+msgstr "förväntade \"flush\" efter ls-refs-argument"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4643,7 +4690,7 @@
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
+#: merge-recursive.c:3089 git-submodule.sh:985
msgid "submodule"
msgstr "undermodul"
@@ -4761,10 +4808,20 @@
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:3774 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "misslyckades läsa cachen"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "kunde inte skriva ny indexfil"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4814,108 +4871,116 @@
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:208
#, 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:258
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
-#: midx.c:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "Lägger till paketfiler till multi-pack-index"
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "såg inte paketfilen %s som skulle kastas"
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr "inga paketfiler att indexera."
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "Skriver stycken till multi-pack-index"
-#: midx.c:1052
+#: midx.c:1056
#, 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:1112
msgid "Looking for referenced packfiles"
msgstr "Ser efter refererade packfiler"
-#: midx.c:1123
+#: midx.c:1127
#, 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:1132
+msgid "the midx contains no oid"
+msgstr "midx saknar oid"
+
+#: midx.c:1141
msgid "Verifying OID order in multi-pack-index"
msgstr "Bekräftar OID-ordning i multi-pack-index"
-#: midx.c:1137
+#: midx.c:1150
#, 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:1170
msgid "Sorting objects by packfile"
msgstr "Sorterar objekt efter packfil"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1180
+#: midx.c:1193
#, 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:1199
#, 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:1208
#, 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:1233
msgid "Counting referenced objects"
msgstr "Räknar refererade objekt"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ser efter och tar bort orefererade packfiler"
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr "kunde inte starta pack-objects"
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr "kunde inte avsluta pack-objects"
@@ -4999,6 +5064,11 @@
msgid "hash mismatch %s"
msgstr "hashvärde stämmer inte överens %s"
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan inte hämta storlek på %s"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
@@ -5013,10 +5083,26 @@
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:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "felformat objektnamn \"%s\""
#: parse-options.c:38
#, c-format
@@ -5058,26 +5144,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "menade du \"--%s\" (med två bindestreck)?"
-#: parse-options.c:857
+#: parse-options.c:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "alias för --%s"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "okänd flagga \"%s\""
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "okänd flagga \"%c\""
-#: parse-options.c:861
+#: parse-options.c:858
#, 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:882
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
@@ -5085,46 +5176,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
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 +5249,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"
@@ -5269,7 +5334,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "kunde inte skapa trådad lstat: %s"
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
@@ -5282,29 +5347,42 @@
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:77
msgid "could not start `log`"
msgstr "kunde inte starta \"log\""
-#: range-diff.c:77
+#: range-diff.c:79
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:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%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 ""
+"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
+"\"%s\""
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "kunde inte tolka git-huvudet \"%.*s\""
-#: range-diff.c:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
-#: 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 "kunde inte tolka loggen för \"%s\""
@@ -5421,9 +5499,9 @@
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "indexfilen trasig"
@@ -5478,12 +5556,12 @@
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:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, 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:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
@@ -5617,14 +5695,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:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, 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:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "kunde inte skriva \"%s\"."
@@ -5658,132 +5736,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:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, 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:1936
msgid "gone"
msgstr "försvunnen"
@@ -5969,114 +5929,232 @@
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "ingen gren, ombaserar %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "ingen gren, ombaserar frånkopplat HEAD %s"
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "ingen gren, \"bisect\" startad på %s"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "ingen gren"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, 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:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorerar trasig referens %s"
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "flaggan \"%s\" är inkompatibel med --merged"
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, 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:2508
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr "flaggan \"%s\" måste peka på en incheckning"
-#: remote.c:366
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "\"%s\" pekar inte på ett giltigt objekt!"
+
+#: refs.c:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorerar dinglande symbolisk referens %s"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "kunde inte öppna \"%s\" för skrivning: %s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "Kunde inte läsa referensen \"%s\""
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "referensen \"%s\" finns redan"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "oväntat objekt-id vid skrivning \"%s\""
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "kunde inte skriva till \"%s\""
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "oväntat objekt-id vid borttagning \"%s\""
+
+#: refs.c:954
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "loggen för referensen %s har lucka efter %s"
+
+#: refs.c:960
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "loggen för referensen %s slutade oväntat på %s"
+
+#: refs.c:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "loggen för %s är tom"
+
+#: refs.c:1111
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
+
+#: refs.c:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref misslyckades för referensen \"%s\": %s"
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "\"%s\" finns; kan inte skapa \"%s\""
+
+#: refs.c:2113 refs.c:2148
+#, 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\""
+
+#: remote.c:355
#, 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:403
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:411
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:594
#, 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:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:1004
+#: remote.c:986
#, c-format
msgid "src refspec %s does not match any"
msgstr "käll-referensspecifikationen %s motsvarar ingen"
-#: remote.c:1009
+#: remote.c:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr "käll-referensspecifikationen %s motsvarar mer än en"
@@ -6085,7 +6163,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6108,7 +6186,7 @@
"\n"
"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6119,7 +6197,7 @@
"Var det meningen att skapa en ny gren genom att sända\n"
"till \"%s:refs/heads/%s\"?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6130,7 +6208,7 @@
"Var det meningen att skapa en ny tagg genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6141,7 +6219,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:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6152,114 +6230,114 @@
"Var det meningen att tagga en ny blob genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kan inte slås upp till en gren"
-#: remote.c:1106
+#: remote.c:1088
#, 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:1100
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
-#: remote.c:1125
+#: remote.c:1107
#, 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:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1646
+#: remote.c:1628
#, 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:1643
#, 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:1655
#, 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:1665
#, 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:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Kunde inte hitta fjärr-referensen %s"
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignorerar märklig referens \"%s\" lokalt"
-#: remote.c:2020
+#: remote.c:2002
#, 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:2006
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:2009
#, 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:2013
#, 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:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (använd \"%s\" för detaljer)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "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:2026
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:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6269,11 +6347,11 @@
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2055
+#: remote.c:2037
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:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6288,11 +6366,11 @@
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2068
+#: remote.c:2050
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:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "kan inte tolka förväntat objektnamn \"%s\""
@@ -6312,6 +6390,11 @@
msgid "replace depth too high for object %s"
msgstr "ersättningsdjupet för högt för objektet %s"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "Hashningsalgoritmen %s stöds inte i detta bygge."
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "trasig MERGE_RR"
@@ -6370,7 +6453,7 @@
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6405,20 +6488,29 @@
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:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "kunde inte hitta trädet för %s."
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2500
+#: revision.c:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: revision.c:2712
+#: revision.c:2870
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L stöder ännu inte andra diff-format än -p och -s"
@@ -6440,29 +6532,29 @@
"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:145
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:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-#: send-pack.c:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:309
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:423
+#: send-pack.c:399
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:425
+#: send-pack.c:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6470,47 +6562,47 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:437
+#: send-pack.c:413
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:442
+#: send-pack.c:418
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
-#: sequencer.c:296
+#: sequencer.c:297
#, 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:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr "revert"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "okänd funktion: %d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6518,7 +6610,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:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6528,44 +6620,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:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:412
+#: sequencer.c:413
#, 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:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:466
+#: sequencer.c:457
#, 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:461
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:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
@@ -6573,65 +6664,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "ingen nyckel i \"%.*s\""
-#: sequencer.c:757
+#: sequencer.c:748
#, 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:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "okänd variabel \"%s\""
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "\"GIT_AUTHOR_NAME\" saknas"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "\"GIT_AUTHOR_DATE\" saknas"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6660,11 +6751,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6691,7 +6782,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6716,326 +6807,331 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, 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:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
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:1346 builtin/am.c:1566 builtin/merge.c:695
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:1379 sequencer.c:1450
#, 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:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "kunde inte uppdatera %s"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, 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:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, 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:1637
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:1662
+#: sequencer.c:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, 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:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:1804
+#: sequencer.c:1811
#, 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:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, 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:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, 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:2310
msgid "cancelling a cherry picking in progress"
msgstr "avbryter pågående \"cherry-pick\""
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "avbryter pågående \"revert\""
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: \"%s\""
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "en \"revert\" pågår redan"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "en \"cherry-pick\" pågår redan"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, 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:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
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:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
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:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, 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:2830
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:2871
msgid "no revert in progress"
msgstr "ingen \"revers\" pågår"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "ingen \"cherry-pick\" pågår"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "kunde inte hoppa över incheckningen"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "ingenting att hoppa över"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -7044,21 +7140,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:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7077,22 +7168,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, 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:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Kör: %s\n"
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7107,11 +7203,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
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:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7128,102 +7224,128 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:3261
+#: sequencer.c:3279
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:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3418
+#: sequencer.c:3437
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:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:3594
+#: sequencer.c:3613
#, 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:3629
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3703
+msgid "Cannot autostash"
+msgstr "Kan inte utföra \"autostash\""
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Oväntat svar från stash: \"%s\""
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Kunde inte skapa katalog för \"%s\""
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Skapade autostash: %s\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "kunde inte utföra \"reset --hard\""
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, 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:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"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
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "Tillämpning av autostash gav konflikter."
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash finns; skapar ny stash-post."
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: inte ett giltigt OID"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7244,48 +7366,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Ombaserar (%d/%d)%s"
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Lyckades ombasera och uppdatera %s.\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7295,59 +7427,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:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:4338
+#: sequencer.c:4446
#, 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:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:5213
+#: sequencer.c:5336
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 +7489,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 +7501,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 +7517,92 @@
"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:569
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:567
+#: setup.c:577
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "fel vid öppning av \"%s\""
-#: setup.c:588
+#: setup.c:598
#, 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:600
#, c-format
msgid "error reading %s"
msgstr "fel vid läsning av %s"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "ogiltigt gitfilformat: %s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "ingen sökväg i gitfil: %s"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "inte ett git-arkiv: %s"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "\"$%s\" för stor"
-#: setup.c:709
+#: setup.c:722
#, 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:751 setup.c:753 setup.c:784
#, 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:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "misslyckades ta status på \"%*ss%s%s\""
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "kan inte byta till \"%s\""
-#: setup.c:1128
+#: setup.c:1141
#, 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:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7480,7 +7612,7 @@
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7489,269 +7621,269 @@
"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:1304
msgid "open /dev/null or dup failed"
msgstr "misslyckades öppna /dev/null eller \"dup\""
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr "\"fork\" misslyckades"
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr "\"setsid\" misslyckades"
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "kunde inte normalisera supplerande objektsökväg: %s"
-#: sha1-file.c:575
+#: sha1-file.c:593
#, 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
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "kan inte normalisera objektkatalogen: %s"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "kan inte läsa \"alternates\"-filen"
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "mmap misslyckades"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr "trasigt löst objekt \"%s\""
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "skräp i slutet av löst objekt \"%s\""
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "felaktig objekttyp"
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-#: sha1-file.c:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "kan inte packa upp %s-huvudet"
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
-#: sha1-file.c:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "kan inte tolka %s-huvud"
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr "misslyckades läsa objektet %s"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "ersättningen %s hittades inte för %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "löst objekt %s (lagrat i %s) är trasigt"
-#: sha1-file.c:1641
+#: sha1-file.c:1652
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "packat objekt %s (lagrat i %s) är trasigt"
-#: sha1-file.c:1746
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr "kunde inte skriva filen %s"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "kan inte sätta behörigheten till \"%s\""
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "fel vid skrivning av fil"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "fel vid stängning av fil för löst objekt"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-#: sha1-file.c:1847
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr "kan inte skapa temporär fil"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "kunde inte skriva fil för löst objekt"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "förvirrad av instabil objektkälldata för %s"
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#: sha1-file.c:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr "\"utime()\" misslyckades på %s"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "kan inte läsa objekt för %s"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "trasik incheckning"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "trasig tagg"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "läsfel vid indexering av %s"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr "för lite lästes vid indexering av %s"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: misslyckades lägga in i databasen"
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash stämmer inte för %s (förväntade %s)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "kan inte utföra \"mmap\" för %s"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "kan inte packa upp huvud för %s"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "kan inte tolka huvud för %s"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
@@ -7854,43 +7986,43 @@
msgstr "felaktigt objektnamn \"%.*s\"."
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u,%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, 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:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u,%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, 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:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u,%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, 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:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7898,18 +8030,42 @@
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, 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:1180
#, 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 ""
@@ -7973,7 +8129,7 @@
msgid "process for submodule '%s' failed"
msgstr "process för undermodulen \"%s\" misslyckades"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
@@ -8089,39 +8245,15 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2248
+#: submodule.c:2250
#, 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
#, c-format
msgid "running trailer command '%s' failed"
@@ -8176,99 +8308,6 @@
msgid "could not rename temporary file to %s"
msgstr "kunde inte byta namn på temporär fil till %s"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "kunde inte läsa paketet (bundlen) \"%s\""
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: \"%s\""
-
-#: transport.c:266
-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
-msgid "server options require protocol version 2 or later"
-msgstr "serverflaggor kräver protokollversion 2 eller senare"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "kunde inte tolka inställningen för transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "stöd för protokoll v2 ännu ej implementerat"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "okänt värde för inställningen \"%s\": %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transporten \"%s\" tillåts inte"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync stöds inte längre"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Följande undermodulsökvägar innehåller ändringar som\n"
-"inte kan hittas av fjärrarna:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Testa\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"eller cd till sökvägen och använd\n"
-"\n"
-"\tgit push\n"
-"\n"
-"för att sända dem till fjärren.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Avbryter."
-
-#: transport.c:1201
-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"
@@ -8315,7 +8354,7 @@
msgid "error while running fast-import"
msgstr "fel när fast-import kördes"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "kunde inte läsa referensen %s"
@@ -8333,6 +8372,10 @@
msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "funktionen stöds inte av protokollet"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8373,24 +8416,24 @@
msgid "helper %s does not support 'push-option'"
msgstr "hjälparen %s stöder inte \"push-option\""
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr "hjälparen %s stöder inte \"force\""
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "kunde inte köra fast-export"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "fel vid körning av fast-export"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8399,50 +8442,139 @@
"Inga gemensamma referenser och inga angavs; gör inget.\n"
"Du kanske borde ange en gren såsom \"master\".\n"
-#: transport-helper.c:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "felformat svar i referenslistan: %s"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "läs(%s) misslyckades"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "skriv(%s) misslyckades"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "%s-tråden misslyckades"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s-tråden misslyckades ansluta: %s"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "kan inte starta tråd för kopiering av data: %s"
-#: transport-helper.c:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "processen %s misslyckades vänta"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "processen %s misslyckades"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
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"
+msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "kunde inte läsa paketet (bundlen) \"%s\""
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ogiltig flagga för depth: \"%s\""
+
+#: transport.c:266
+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
+msgid "server options require protocol version 2 or later"
+msgstr "serverflaggor kräver protokollversion 2 eller senare"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "kunde inte tolka inställningen för transport.color.*"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "stöd för protokoll v2 ännu ej implementerat"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "okänt värde för inställningen \"%s\": %s"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporten \"%s\" tillåts inte"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync stöds inte längre"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Följande undermodulsökvägar innehåller ändringar som\n"
+"inte kan hittas av fjärrarna:\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Testa\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"eller cd till sökvägen och använd\n"
+"\n"
+"\tgit push\n"
+"\n"
+"för att sända dem till fjärren.\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "Avbryter."
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "kunde inte sända alla nödvändiga undermoduler"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "trädobjekt för kort"
@@ -8459,7 +8591,7 @@
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 +8600,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 +8609,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 +8619,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 +8629,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 +8638,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 +8647,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 +8657,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 +8666,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 +8675,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 +8685,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 +8695,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 +8704,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 +8713,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 +8724,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 +8735,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 +8745,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 +8755,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 +8764,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 +8773,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 +8787,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 +8846,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:1337
+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,32 +8887,32 @@
msgid "Fetching objects"
msgstr "Hämtar objekt"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: worktree.c:305
+#: worktree.c:309
#, 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:320
#, 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:332
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: worktree.c:334
+#: worktree.c:338
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "\"%s\" är inte en .git-fil, felkod %d"
-#: worktree.c:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
@@ -8817,11 +8962,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,8 +8995,7 @@
#: 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
msgid "both deleted:"
@@ -8925,22 +9069,22 @@
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "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 +9092,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 +9103,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 +9211,142 @@
"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:1692
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9214,32 +9358,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:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1759
+#: wt-status.c:1757
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:1763
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, 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:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9248,67 +9392,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:1777
#, 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:1780
#, 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:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1788
+#: wt-status.c:1786
#, 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:1790
#, 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:1903
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "olika"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "efter "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, 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:2474
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:2476
#, 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:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -9322,7 +9466,7 @@
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
@@ -9335,7 +9479,7 @@
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:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
@@ -9370,8 +9514,8 @@
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/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "testkörning"
@@ -9380,7 +9524,7 @@
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
@@ -9486,7 +9630,7 @@
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
@@ -9507,13 +9651,13 @@
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:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file ä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:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul kräver --pathspec-from-file"
@@ -9673,36 +9817,36 @@
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:1699 builtin/commit.c:395
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
#, 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:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1770
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:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9712,7 +9856,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:1821
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 +9868,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:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\"."
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2025
+#: builtin/am.c:2024
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9742,153 +9886,155 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2131
#, 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:2171
#, 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:2175
#, 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:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2217
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:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2221
+#: builtin/am.c:2220
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
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:2234
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:2237
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:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr "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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c: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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr "format"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2272
+#: builtin/am.c:2271
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:2274
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2284
+#: builtin/am.c:2283
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:2287
msgid "show the patch being applied"
msgstr "visa patchen som tillämpas"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2295
+#: builtin/am.c:2294
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:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -9896,16 +10042,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:2325
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, 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:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9914,11 +10060,11 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2371
+#: builtin/am.c:2370
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:2380
msgid "interactive mode requires patches on the command line"
msgstr "interaktivt läge kräver patchar på kommandoraden"
@@ -10330,7 +10476,7 @@
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr "rev"
@@ -10398,14 +10544,14 @@
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Klandra rader"
@@ -10615,7 +10761,7 @@
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "uppströms"
@@ -10707,99 +10853,99 @@
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:433
+#: builtin/tag.c:434
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:658
+#: builtin/branch.c:657
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:682 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:708
+#: builtin/branch.c:706
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:753
+#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:758
+#: builtin/branch.c:756
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:765
+#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:768
+#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:783
+#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:792
+#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:797
+#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:801
+#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:808
+#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:821
+#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:825
+#: builtin/branch.c:823
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:831
+#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:841
+#: builtin/branch.c:839
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -10807,7 +10953,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:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10831,19 +10977,19 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fil> [<refnamn>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:66 builtin/pack-objects.c:3376
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
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:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
@@ -10873,7 +11019,7 @@
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,7 +11027,7 @@
"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]"
@@ -10889,72 +11035,72 @@
"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 "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 git-submodule.sh:984
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 +11128,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:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -11075,7 +11221,7 @@
#: 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/worktree.c:675
msgid "string"
msgstr "sträng"
@@ -11103,98 +11249,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:256
#, 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:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, 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:395
#, 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:400
#, 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:407
#, 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:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, 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:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "varken \"%s\" eller \"%s\" har angivits"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, 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:463 builtin/checkout.c:468
#, 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:527 builtin/checkout.c:534
#, 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:704
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:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11203,50 +11349,50 @@
"kan inte fortsätta med köade ändringar i följande filer:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, 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:903
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, 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:920 builtin/checkout.c:1344
#, 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:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11269,7 +11415,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11296,19 +11442,19 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
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:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11317,7 +11463,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:1159
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 +11483,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:1169
#, 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:1235
msgid "only one reference expected"
msgstr "endast en referens förväntades"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, 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:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1358
#, 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:1360
#, 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:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "förväntade gren, fick \"%s\""
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, 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:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11389,7 +11535,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:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11397,7 +11543,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:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11405,7 +11551,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:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11413,7 +11559,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:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11421,144 +11567,146 @@
"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:1400
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:1407
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:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "\"%s\" kan inte ta <startpunkt>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, 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:1450
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
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
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:1530
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:1533
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
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:1592
+#, 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:1596
msgid "-p and --overlay are mutually exclusive"
msgstr "-p och --overlay är ömsesidigt uteslutande"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
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:1638
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "grennamn saknas; försök med -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr "kunde inte upplösa %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, 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:1697
#, 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:1706
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:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file är inkompatibelt med --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11566,110 +11714,110 @@
"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:1725
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:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1755
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
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:1758
msgid "use overlay mode (default)"
msgstr "använd överläggsläge (standard)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
msgid "create and switch to a new branch"
msgstr "skapa och växla till en ny gren"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1805
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:1807
msgid "second guess 'git switch <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1809
msgid "throw away local modifications"
msgstr "kasta bort lokala ändringar"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
msgstr "vilken träd-igt att checka ut från"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr "återställ indexet"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr "återställ arbetskatalogen (förval)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr "ignorera ej sammanslagna poster"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
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:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -11682,7 +11830,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:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -11709,27 +11857,27 @@
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 +11895,56 @@
"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:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "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
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -11804,7 +11952,7 @@
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11820,7 +11968,7 @@
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
@@ -11840,11 +11988,11 @@
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
@@ -11852,11 +12000,11 @@
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
@@ -11871,7 +12019,7 @@
msgstr "använd --reference endast under kloningen"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr "namn"
@@ -11887,8 +12035,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "djup"
@@ -11896,7 +12044,8 @@
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr "tid"
@@ -11904,12 +12053,12 @@
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
@@ -11926,11 +12075,11 @@
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
@@ -11942,25 +12091,25 @@
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
"flagga att sända"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
@@ -11990,32 +12139,32 @@
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "misslyckades starta iterator över \"%s\""
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "misslyckades iterera över \"%s\""
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "klart.\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"
@@ -12025,137 +12174,137 @@
"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:589
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "misslyckades initiera sparse-checkout"
-#: builtin/clone.c:776
+#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
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:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, 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:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1010 builtin/fetch.c:1789
#, 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:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1030
#, 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:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, 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:1050
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:1064
+#: builtin/clone.c:1070
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
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:1160
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:1162
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:1164
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:1166
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:1169
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, 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:1260
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -12191,6 +12340,97 @@
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+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:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <objkat>] [--append] [--"
+"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <delnings-flaggor>"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kunde inte hitta objektkatalog för %s"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr "kat"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "Objektkatalogen där grafen ska lagras"
+
+#: builtin/commit-graph.c:79
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
+
+#: builtin/commit-graph.c:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "okänt argument för --split, %s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "starta traversering vid alla referenser"
+
+#: builtin/commit-graph.c:157
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "sök paketindex listade på standard in efter incheckningar"
+
+#: builtin/commit-graph.c:159
+msgid "start walk at commits listed by stdin"
+msgstr "börja gå genom incheckningar listade på standard in"
+
+#: builtin/commit-graph.c:161
+msgid "include all commits already in the commit-graph file"
+msgstr "ta med alla incheckningar redan i filen commit-graph"
+
+#: builtin/commit-graph.c:163
+msgid "enable computation for changed paths"
+msgstr "aktivera beräkning av ändrade sökvägar"
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr "tillåt skriva en inkrementell incheckningsgraffil"
+
+#: builtin/commit-graph.c:170
+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:172
+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:174
+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:190
+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:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "förväntade icke-hexadecimalt objekt-ID: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12204,7 +12444,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:547
#, c-format
msgid "not a valid object name %s"
msgstr "objektnamnet är inte giltigt: %s"
@@ -12232,13 +12472,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:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
msgstr "meddelande"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
msgid "commit message"
msgstr "incheckningsmeddelande"
@@ -12246,8 +12486,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:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
@@ -12292,10 +12532,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 +12561,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,38 +12635,38 @@
"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:1099
#, 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:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c: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
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12433,7 +12681,7 @@
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12448,7 +12696,7 @@
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12458,7 +12706,7 @@
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12469,140 +12717,144 @@
"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:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
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:1189
+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:1192
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:1202
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:1204
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:1213
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:1231
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:1237
#, 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:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr "beräkna fullständiga före-/efter-värden"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr "version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
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:1382 builtin/commit.c:1540
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
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:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12610,11 +12862,11 @@
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1391 parse-options.h:192
msgid "when"
msgstr "när"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12622,172 +12874,172 @@
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1394
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1417
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:1499
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
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:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
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:1508
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
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:1510
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:1511
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1513
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
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:1524
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1528
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
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:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1652
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1659
#, 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:1664
#, 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:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -12798,77 +13050,6 @@
"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>]"
@@ -13193,50 +13374,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 +13421,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 +13430,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,90 +13444,90 @@
"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"
@@ -13583,7 +13759,7 @@
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:1177 builtin/log.c:1724
msgid "refspec"
msgstr "referensspecifikation"
@@ -13611,104 +13787,105 @@
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fetch.c: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:117
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kan inte vara negativt"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:140 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:142 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:144 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:146 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:147
msgid "force overwrite of local reference"
msgstr "tvinga överskrivning av lokal referens"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:151 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:153
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
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:157 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:159
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:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
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:170 builtin/fetch.c:176 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:172 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:178 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:181
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:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13716,94 +13893,94 @@
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:188 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:189 builtin/pull.c:226
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:196
+#: builtin/fetch.c:197 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
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr "kör \"gc --auto\" efter hämtning"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 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:204
msgid "write the commit-graph after fetching"
msgstr "skriv incheckingsgrafen efter hämtning"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, 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:752
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
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:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13814,7 +13991,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:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13827,22 +14004,22 @@
"showForcedUpdates\n"
"false\" för att undvika testet.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:914
#, 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:935
#, 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:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13851,56 +14028,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:1128
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, 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:1204
#, 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:1207
#, 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:1415
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1430
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:1432
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:1434
msgid "unknown branch type"
msgstr "okänd grentyp"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13908,22 +14085,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:1562 builtin/fetch.c:1625
#, 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:1572 builtin/fetch.c:1627 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1584
#, 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:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -13931,44 +14108,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:1724
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
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:1798
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:1800
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1809
#, 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:1816
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:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -13976,29 +14153,29 @@
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <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"
@@ -14039,7 +14216,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:440
msgid "respect format colors"
msgstr "använd formatfärger"
@@ -14288,7 +14465,7 @@
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:786 builtin/prune.c:134
msgid "show progress"
msgstr "visa förlopp"
@@ -14324,12 +14501,12 @@
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:475 builtin/init-db.c:57
#, 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:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
@@ -14427,258 +14604,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:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, 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:475 builtin/grep.c:600 builtin/grep.c:640
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:724
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:803
+#: builtin/grep.c:823
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:825
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:827
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:829
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:825
+#: builtin/grep.c:845
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr "sök i underkataloger (standard)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
msgid "show column number of first match"
msgstr "visa kolumnnummer för första träff"
-#: builtin/grep.c:847
+#: builtin/grep.c:867
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:852
+#: builtin/grep.c:872
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:874
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
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:879
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show only matching parts of a line"
msgstr "visa endast träffade delar av rader"
-#: builtin/grep.c:864
+#: builtin/grep.c:884
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:885
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
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:889
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:892
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:895
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
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:905
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:906
+#: builtin/grep.c:926
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:908
+#: builtin/grep.c:928
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
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:1003
msgid "no pattern given"
msgstr "inget mönster angavs"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
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:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked stöds inte med --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
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:1084 builtin/pack-objects.c:3548
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:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
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:1147
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:1153
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:1161
msgid "both --cached and trees are given"
msgstr "både --cached och träd angavs"
@@ -14720,66 +14897,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 +14965,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,35 +14974,35 @@
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:350
+#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:367
+#: builtin/help.c:453
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:375
+#: builtin/help.c:461
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:367
#, 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"
@@ -14863,7 +15040,7 @@
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
@@ -14871,6 +15048,11 @@
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -14929,8 +15111,8 @@
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
@@ -14991,7 +15173,7 @@
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
@@ -15024,169 +15206,178 @@
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:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1430
#, 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:1438
#, 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:1462
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, 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:1598
#, 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:1646
#, 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:1653
#, 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:1692
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:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
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:1782
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
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:1836 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:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "kan inte ta status på mallen \"%s\""
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "kan inte öppna katalogen (opendir) \"%s\""
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "kan inte läsa länk (readlink) \"%s\""
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, 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:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kan inte kopiera \"%s\" till \"%s\""
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "ignorerar mallen %s"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "mallarna hittades inte i %s"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, 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:356
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
#, 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:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr "försöker initiera arkivet på nytt med annan hash"
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "okänd hashningsalgoritm \"%s\""
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, 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:459
#, 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:463
#, 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:464
#, 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:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15194,25 +15385,33 @@
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:544
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "ange hashningsalgoritm att använda"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15221,7 +15420,7 @@
"%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:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
@@ -15290,126 +15489,126 @@
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:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr "dekorera endast referenser som motsvarar <mönster>"
-#: builtin/log.c:179
+#: builtin/log.c:184
msgid "do not decorate refs that match <pattern>"
msgstr "dekorera inte referenser som motsvarar <mönster>"
-#: builtin/log.c:180
+#: builtin/log.c:185
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:183
+#: builtin/log.c:188
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, 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:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "kunde inte läsa objektet %s"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "okänd typ: %d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: ogiltigt omslag från beskrivningsläge"
-#: builtin/log.c:821
+#: builtin/log.c:842
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr "kan inte öppna patchfilen %s"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "behöver precis ett intervall"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "inte ett intervall"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr "misslyckades skapa fil för omslagsbrev"
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1334
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:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, 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:1455 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "misslyckades slå upp \"%s\" som en giltig referens"
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15419,381 +15618,381 @@
"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:1484
msgid "failed to find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
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:1499
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1531
+#: builtin/log.c:1552
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "misslyckades räkna ut intervall range-diff"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
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:1653
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1641
+#: builtin/log.c:1662
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1644
+#: builtin/log.c:1665
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:1667
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "cover-from-description-läge"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
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:1688
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:1690
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:1692
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr "epost"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1698
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:1700
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1682
+#: builtin/log.c:1701
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:1702 builtin/log.c:1705
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1691
+#: builtin/log.c:1710
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1693
+#: builtin/log.c:1712
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1696
+#: builtin/log.c:1715
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:1717
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1701
+#: builtin/log.c:1720
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1703
+#: builtin/log.c:1722
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:1725
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:1727
msgid "percentage by which creation is weighted"
msgstr "procent som skapelse vägs med"
-#: builtin/log.c:1792
+#: builtin/log.c:1812
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr "-n och -k kan inte användas samtidigt"
-#: builtin/log.c:1809
+#: builtin/log.c:1829
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:1837
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken ska det vara?"
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff mot v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor kräver --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:1993
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:2001
msgid "Range-diff:"
msgstr "Intervall-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr "Intervall-diff mot v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr "misslyckades skapa utdatafiler"
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@ -15811,7 +16010,7 @@
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
msgid "exec"
msgstr "exec"
@@ -15884,392 +16083,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 +16103,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 +16194,392 @@
msgid "Merging %s with %s\n"
msgstr "Slår ihop %s med %s\n"
+#: builtin/merge.c:56
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<flaggor>] [<incheckning>...]"
+
+#: builtin/merge.c:57
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:58
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:121
+msgid "switch `m' requires a value"
+msgstr "flaggan \"m\" behöver ett värde"
+
+#: builtin/merge.c:144
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "flaggan \"%s\" behöver ett värde"
+
+#: builtin/merge.c:190
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available strategies are:"
+msgstr "Tillgängliga strategier är:"
+
+#: builtin/merge.c:196
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Tillgängliga skräddarsydda strategier är:"
+
+#: builtin/merge.c:247 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:250 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:251 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(synonym till --stat)"
+
+#: builtin/merge.c:253 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:256 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:258 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:260 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "redigera meddelande innan incheckning"
+
+#: builtin/merge.c:262
+msgid "allow fast-forward (default)"
+msgstr "tillåt snabbspolning (standard)"
+
+#: builtin/merge.c:264 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "avbryt om snabbspolning inte är möjlig"
+
+#: builtin/merge.c:268 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:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
+msgid "strategy"
+msgstr "strategi"
+
+#: builtin/merge.c:270 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "sammanslagningsstrategi att använda"
+
+#: builtin/merge.c:271 builtin/pull.c:172
+msgid "option=value"
+msgstr "alternativ=värde"
+
+#: builtin/merge.c:272 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "alternativ för vald sammanslagningsstrategi"
+
+#: builtin/merge.c:274
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
+
+#: builtin/merge.c:281
+msgid "abort the current in-progress merge"
+msgstr "avbryt den pågående sammanslagningen"
+
+#: builtin/merge.c:283
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort men lämna index och arbetskatalog ensamma"
+
+#: builtin/merge.c:285
+msgid "continue the current in-progress merge"
+msgstr "fortsätt den pågående sammanslagningen"
+
+#: builtin/merge.c:287 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "tillåt sammanslagning av orelaterade historier"
+
+#: builtin/merge.c:294
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "kunde köra stash."
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "stash misslyckades"
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr "inte ett giltigt objekt: %s"
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr "read-tree misslyckades"
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr " (inget att platta till)"
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
+
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
+
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "\"%s\" verkar inte peka på en incheckning"
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
+
+#: builtin/merge.c:716
+msgid "Not handling anything other than two heads merge."
+msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
+
+#: builtin/merge.c:730
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Felaktig flagga för merge-recursive: -X%s"
+
+#: builtin/merge.c:745
+#, c-format
+msgid "unable to write %s"
+msgstr "kunde inte skriva %s"
+
+#: builtin/merge.c:797
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Kunde inte läsa från \"%s\""
+
+#: builtin/merge.c:806
+#, 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:812
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\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:817
+msgid "An empty message aborts the commit.\n"
+msgstr "Ett tomt meddelande avbryter incheckningen.\n"
+
+#: builtin/merge.c:820
+#, 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:873
+msgid "Empty commit message."
+msgstr "Tomt incheckningsmeddelande."
+
+#: builtin/merge.c:888
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Underbart.\n"
+
+#: builtin/merge.c:949
+#, 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:988
+msgid "No current branch."
+msgstr "Inte på någon gren."
+
+#: builtin/merge.c:990
+msgid "No remote for the current branch."
+msgstr "Ingen fjärr för aktuell gren."
+
+#: builtin/merge.c:992
+msgid "No default upstream defined for the current branch."
+msgstr "Ingen standarduppström angiven för aktuell gren."
+
+#: builtin/merge.c:997
+#, 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:1054
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
+
+#: builtin/merge.c:1157
+#, 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:1191
+msgid "not something we can merge"
+msgstr "inte något vi kan slå ihop"
+
+#: builtin/merge.c:1295
+msgid "--abort expects no arguments"
+msgstr "--abort tar inga argument"
+
+#: builtin/merge.c:1299
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
+
+#: builtin/merge.c:1317
+msgid "--quit expects no arguments"
+msgstr "--quit tar inga argument"
+
+#: builtin/merge.c:1330
+msgid "--continue expects no arguments"
+msgstr "--continue tar inga argument"
+
+#: builtin/merge.c:1334
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
+
+#: builtin/merge.c:1350
+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:1357
+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:1360
+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:1374
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Du kan inte kombinera --squash med --no-ff."
+
+#: builtin/merge.c:1376
+msgid "You cannot combine --squash with --commit."
+msgstr "Du kan inte kombinera --squash med --commit."
+
+#: builtin/merge.c:1392
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
+
+#: builtin/merge.c:1409
+msgid "Squash commit into empty head not supported yet"
+msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
+
+#: builtin/merge.c:1411
+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:1416
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - inte något vi kan slå ihop"
+
+#: builtin/merge.c:1418
+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:1499
+msgid "refusing to merge unrelated histories"
+msgstr "vägrar slå samman orelaterad historik"
+
+#: builtin/merge.c:1508
+msgid "Already up to date."
+msgstr "Redan à jour."
+
+#: builtin/merge.c:1518
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Uppdaterar %s..%s\n"
+
+#: builtin/merge.c:1564
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
+
+#: builtin/merge.c:1571
+#, c-format
+msgid "Nope.\n"
+msgstr "Nej.\n"
+
+#: builtin/merge.c:1596
+msgid "Already up to date. Yeeah!"
+msgstr "Redan à jour. Toppen!"
+
+#: builtin/merge.c:1602
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kan inte snabbspola, avbryter."
+
+#: builtin/merge.c:1630 builtin/merge.c:1695
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Återspolar trädet till orört...\n"
+
+#: builtin/merge.c:1634
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Försöker sammanslagningsstrategin %s...\n"
+
+#: builtin/merge.c:1686
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
+
+#: builtin/merge.c:1688
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Sammanslagning med strategin %s misslyckades.\n"
+
+#: builtin/merge.c:1697
+#, 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:1711
+#, 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/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16417,7 +16616,7 @@
"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/prune-packed.c:25
msgid "too many arguments"
msgstr "för många argument"
@@ -16518,7 +16717,7 @@
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
@@ -16710,7 +16909,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:533
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
@@ -16944,7 +17143,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:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
@@ -16962,7 +17161,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:164
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
@@ -16978,119 +17177,119 @@
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:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, 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:442
#, c-format
msgid "corrupt packed object for %s"
msgstr "trasigt packat objekt för %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:573
#, 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:784
#, 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:973
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:986
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 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:1100
#, 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:1298
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:1725
#, 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:1734
#, 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:2005
msgid "Counting objects"
msgstr "Räknar objekt"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, 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:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, 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:2223 builtin/pack-objects.c:2250
#, 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:2260
msgid "suboptimal pack - out of memory"
msgstr "icke-optimalt pack - minnet slut"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, 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:2714
#, 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:2802
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr "deltaräknaren är inkonsekvent"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17099,7 +17298,7 @@
"förväntade kant-objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17108,227 +17307,227 @@
"förväntade objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
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:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr "kan inte öppna paketfilen"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, 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:3168
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens \"%s\""
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr "felaktig revision \"%s\""
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr "kan inte lägga till nya objekt"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr "<version>[,<offset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
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:3388
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3390
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:3392
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3396
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:3398
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:3400
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
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:3408
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:3410
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3412
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:3415
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:3418
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3421
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:3424
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
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:3428
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
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:3435
msgid "use the sparse reachability algorithm"
msgstr "använd gles-nåbarhetsalgoritmen"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
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:3441
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:3443
msgid "ignore this pack"
msgstr "ignorera detta paket"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
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:3451
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:3455
msgid "write a bitmap index if possible"
msgstr "skriv bitkartindex om möjligt"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3459
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
msgid "do not pack objects in promisor packfiles"
msgstr "packa inte objekt i kontraktspackfiler"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3464
msgid "respect islands during delta compression"
msgstr "respektera öar under deltakomprimering"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3493
#, 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:3498
#, 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:3552
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:3554
msgid "minimum pack size limit is 1 MiB"
msgstr "minsta packstorlek är 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3559
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:3562
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:3568
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17349,31 +17548,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 +17581,73 @@
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:478 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:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"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:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17431,14 +17655,14 @@
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:428
+#: builtin/pull.c:461
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:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17446,7 +17670,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:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17457,42 +17681,42 @@
"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:470 builtin/rebase.c:1234 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
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:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:466
+#: builtin/pull.c:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17501,32 +17725,28 @@
"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:610
#, c-format
msgid "unable to access commit %s"
msgstr "kunde inte komma åt incheckningen %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
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:920
+#: builtin/pull.c:955
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:959
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17537,7 +17757,7 @@
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17554,15 +17774,15 @@
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
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:1010
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
@@ -17716,12 +17936,12 @@
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
@@ -17750,65 +17970,65 @@
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr "<refnamn>:<förvänta>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:556
+#: builtin/push.c:555
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:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:561
+#: builtin/push.c:559
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:562
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:567
+#: builtin/push.c:565
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:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:590
+#: builtin/push.c:587
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:589
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
-#: builtin/push.c:612
+#: builtin/push.c:609
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17829,27 +18049,27 @@
"\n"
" git push <namn>\n"
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:630
+#: builtin/push.c:627
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:634
+#: builtin/push.c:631
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:636
+#: builtin/push.c:633
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:639
+#: builtin/push.c:636
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
@@ -17977,7 +18197,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 +18205,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:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "oanvändbar todo-lista: %s"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "kunde inte skapa temporär %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "kunde inte markera som interaktiv"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "Kunde inte skapa attgöra-lista"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
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:468
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:481 builtin/rebase.c:1374
+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:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr "ombasera sammanslagningar"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr "behåll ursprungliga förgreningspunkter för kusiner"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr "flytta incheckningar som inleds med squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr "signera incheckningar"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
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:496
msgid "continue rebase"
msgstr "fortsätt ombasering"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "hoppa över incheckning"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "redigera attgöra-listan"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "visa nuvarande patch"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr "förkorta inchecknings-id i todo-listan"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr "utöka inchecknings-id i todo-listan"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr "kontrollera todo-listan"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr "ordna om fixup-/squash-rader"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "lägg in exec-kommandon i todo-listan"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "ovanpå"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "begränsa revision"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "tryck ihop ovanpå"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "uppströmsincheckningen"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "namn på huvud"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "sammanslagningsstrategi"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "strategiflaggor"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "switch-to"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
msgstr "gren eller inchecking att checka ut"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "på-namn"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "kmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "kommando att köra"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
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:553
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:569
#, 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
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "kunde inte hämta \"onto\": \"%s\""
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "ogiltigt orig-head: \"%s\""
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, 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:799 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18209,7 +18415,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:882
#, c-format
msgid ""
"\n"
@@ -18228,7 +18434,7 @@
"\n"
"Därför kan inte git ombasera dessa."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18236,7 +18442,7 @@
msgstr ""
"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -18253,7 +18459,7 @@
" git rebase '<gren>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18266,136 +18472,136 @@
" git branch --set-upstream-to=%s/<gren> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
msgid "exec commands cannot contain newlines"
msgstr "exec-kommandon kan inte innehålla nyradstecken"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1276
msgid "empty exec command"
msgstr "tomt exec-kommando"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
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:1307
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:1309
msgid "allow pre-rebase hook to run"
msgstr "tillåt pre-rebase-krok att köra"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1311
msgid "be quiet. implies --no-stat"
msgstr "var tyst. implicerar --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
msgid "do not show diffstat of what changed upstream"
msgstr "visa inte en diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1320
msgid "add a Signed-off-by: line to each commit"
msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr "sänds till \"git am\""
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr "sänds till \"git apply\""
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
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:1339
msgid "continue"
msgstr "fortsätt"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr "hoppa över nuvarande patch och fortsätt"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
msgstr "avbryt och checka ut ursprungsgrenen"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
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:1348
msgid "edit the todo list during an interactive rebase"
msgstr "redigera attgöra-listan under interaktiv ombasering."
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1351
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:1354
msgid "use apply strategies to rebase"
msgstr "använd appliceringstrategier för ombasering"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr "använd sammanslagningsstrategier för ombasering"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
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:1366
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:1371
msgid "how to handle commits that become empty"
msgstr "hur incheckningar som blir tomma ska hanteras"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
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:1385
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:1389
msgid "allow rebasing commits with empty messages"
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
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:1396
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:1398
msgid "use the given merge strategy"
msgstr "använd angiven sammanslagningsstrategi"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
msgid "option"
msgstr "alternativ"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
msgid "pass the argument through to the merge strategy"
msgstr "sänd flaggan till sammanslagningsstrategin"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1404
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:1409
+msgid "apply all changes, even those already present upstream"
+msgstr "applicera alla ändringar, även de som redan finns uppströms"
+
+#: builtin/rebase.c:1426
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18403,37 +18609,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:1432
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:1473
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:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
msgid "cannot combine '--keep-base' with '--root'"
msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+
+#: builtin/rebase.c:1487
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1491
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:1514
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18441,16 +18651,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:1545
msgid "could not discard worktree changes"
msgstr "kunde inte kasta ändringar i arbetskatalogen"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr "kunde inte flytta tillbaka till %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18471,166 +18681,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:1638
msgid "switch `C' expects a numerical value"
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr "Okänt läge: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy kräver --merge eller --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
msgid "cannot combine apply options with merge options"
msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Okänd rebase-bakända: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1794
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:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr "felaktig uppström \"%s\""
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr "kunde inte skapa ny rotincheckning"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, 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:1853
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "\"%s\": behöver precis en sammanslagningsbas"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1861
#, 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:1887
#, 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/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
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:1927
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr "kunde inte växla till %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, 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:1984
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, 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:1994
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2001
#, c-format
msgid "Changes to %s:\n"
msgstr "Ändringar till %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Ändringar från %s till %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, 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:2038
msgid "Could not detach HEAD"
msgstr "Kunde inte koppla från HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, 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:843
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 +18847,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:863
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 +18868,11 @@
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1960
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
@@ -19262,11 +19449,11 @@
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:25
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
-#: 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."
@@ -19275,112 +19462,112 @@
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:191
+#: builtin/repack.c:193
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:232 builtin/repack.c:418
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects."
-#: builtin/repack.c:254
+#: builtin/repack.c:256
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:294
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:294
+#: builtin/repack.c:296
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:299
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:301
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:303
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:305
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:310
+#: builtin/repack.c:312
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
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:316
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:316
+#: builtin/repack.c:318
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:319 builtin/repack.c:325
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:318
+#: builtin/repack.c:320
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:322
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:322
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:324
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:326
+#: builtin/repack.c:328
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:330
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:338
+#: builtin/repack.c:340
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:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "Inget nytt att packa."
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -19399,7 +19586,7 @@
"VARNING: namnet misslyckades också.\n"
"VARNING: Byt namn på dem i %s manuellt:\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
@@ -19709,92 +19896,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/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c: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,12 +19995,12 @@
"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."
@@ -19833,23 +20020,23 @@
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"
@@ -20049,15 +20236,15 @@
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
@@ -20278,70 +20465,58 @@
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
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:212
msgid "failed to create directory for sparse-checkout file"
msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
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:326
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, 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:395
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:420
#, 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:474 builtin/sparse-checkout.c:498
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:543
msgid "read patterns from standard in"
msgstr "läs mönster från standard in"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "ställ in filter för gles utcheckning"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "inaktivera gles utcheckning"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "fel vid uppdatering av arbetskatalog"
@@ -20421,7 +20596,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,7 +20605,7 @@
msgid "%s is not a valid reference"
msgstr "%s är inte en giltigt referens"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "\"git stash clear\" med parametrar har inte implementerats"
@@ -20460,7 +20635,7 @@
msgid "Merging %s with %s"
msgstr "Slår ihop %s med %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits upp ur \"stash\":en"
@@ -20483,105 +20658,107 @@
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:633
msgid "The stash entry is kept in case you need it again."
msgstr "Stash-posten behålls ifall du behöver den igen."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: 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 "Kan inte uppdatera %s med %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr "\"stash\"-meddelande"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
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:1046
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
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:1173
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:1182
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:1193 builtin/stash.c:1202
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:1230
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:1279
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:1295
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:1310
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, 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:1427
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "behåll indexet"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "\"stash\" i \"patch\"-läge"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "tyst läge"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
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:1473 builtin/stash.c:1538
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:1573
+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]"
@@ -21024,17 +21201,25 @@
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:2241 git-submodule.sh:176
#, 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:2257
+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:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, 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:2329
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -21060,11 +21245,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:486
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr "skäl till uppdateringen"
@@ -21157,134 +21342,134 @@
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "tvinga redigering av incheckningsmeddelande"
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:420
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:512
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-#: builtin/tag.c:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -21560,19 +21745,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
@@ -21664,7 +21849,7 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr "misslyckades ta bort \"%s\""
@@ -21746,116 +21931,116 @@
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:435 builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:437
#, 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:446
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:452
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:493
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:496
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
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:507
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
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:676
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:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, 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:690 builtin/worktree.c:723
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:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
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:774
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:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr "målet \"%s\" finns redan"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21864,7 +22049,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:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21872,38 +22057,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:821
#, 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:826
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:874
#, 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:878
#, 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:883
#, 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:906
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:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -21912,7 +22097,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:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -21920,7 +22105,7 @@
"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:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
@@ -21941,17 +22126,123 @@
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr "git version:\n"
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() misslyckades med felet \"%s\" (%d)\n"
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr "kompilatorinfo:"
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr "libc-info:"
+
+#: bugreport.c:74
+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"
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]"
+
+#: bugreport.c:91
+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"
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr "ange mål för buggrapporteringsfilen"
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr "ange ett filändelse i strftime-format"
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "kunde inte skapa inledande kataloger för \"%s\""
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr "Systeminfo"
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr "Aktiverade krokar"
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "kunde inte skapa filen på \"%s\""
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Skapade ny rapport på \"%s\"\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Saknar från-märken för undermodulen \"%s\""
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Saknar till-märken för undermodulen \"%s\""
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Förväntade \"mark\"-kommando, fick %s"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Förväntade \"to\"-kommando, fick %s"
-#: fast-import.c:3254
+#: fast-import.c:3317
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
@@ -21990,7 +22281,7 @@
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"
@@ -22007,7 +22298,7 @@
" [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
" <kommando> [<flaggor>]"
-#: git.c:34
+#: git.c:35
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -22019,47 +22310,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:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "ingen katalog angavs för --git-dir\n"
-#: git.c:200
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "ingen namnrymd angavs för --namespace\n"
-#: git.c:214
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "ingen katalog angavs för --work-tree\n"
-#: git.c:228
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "inget prefix angavs för --super-prefix\n"
-#: git.c:250
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c förväntar en konfigurationssträng\n"
-#: git.c:288
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr "ingen katalog angavs för -C\n"
-#: git.c:314
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr "okänd flagga: %s\n"
-#: git.c:360
+#: git.c:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "vid expandering av aliaset \"%s\": \"%s\""
-#: git.c:369
+#: git.c:371
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22068,39 +22359,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:378
#, c-format
msgid "empty alias for %s"
msgstr "tomt alias för %s"
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr "rekursivt alias: %s"
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr "skrivfel på standard ut"
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr "okänt skrivfel på standard ut"
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr "stäng misslyckades på standard ut"
-#: git.c:793
+#: git.c:792
#, 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:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "kan inte hantera %s som inbyggd"
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
@@ -22109,54 +22400,54 @@
"användning: %s\n"
"\n"
-#: git.c:876
+#: git.c:875
#, 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:887
#, 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:914
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:993
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:1139
#, 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:1146
#, 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:1150
#, 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:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22276,6 +22567,14 @@
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: okänt kommando \"%s\" från git"
+#: 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:85
msgid "args"
msgstr "argument"
@@ -22329,11 +22628,11 @@
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
@@ -22374,621 +22673,625 @@
msgstr "Visa, skapa eller ta bort grenar"
#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Samla information från användaren för att sända en felrapport"
+
+#: command-list.h:60
msgid "Move objects and refs by archive"
msgstr "Flytta objekt och referenser efter arkiv"
-#: command-list.h:60
+#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr ""
"Visa innehåller eller typ- och storleksinformation för objekt i arkivet"
-#: command-list.h:61
+#: command-list.h:62
msgid "Display gitattributes information"
msgstr "Visa information från gitattributes"
-#: command-list.h:62
+#: command-list.h:63
msgid "Debug gitignore / exclude files"
msgstr "Felsök gitignore / exkluderings-filer"
-#: command-list.h:63
+#: command-list.h:64
msgid "Show canonical names and email addresses of contacts"
msgstr "Visa kanoniska namn och e-postadresser för kontakter"
-#: command-list.h:64
+#: command-list.h:65
msgid "Switch branches or restore working tree files"
msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
-#: command-list.h:65
+#: command-list.h:66
msgid "Copy files from the index to the working tree"
msgstr "Kopiera filer från indexet till arbetskatalogen"
-#: command-list.h:66
+#: command-list.h:67
msgid "Ensures that a reference name is well formed"
msgstr "Se till att referensen är välformad"
-#: command-list.h:67
+#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
-#: command-list.h:68
+#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
msgstr "Applicera ändringarna introducerade av befintliga incheckningar"
-#: command-list.h:69
+#: command-list.h:70
msgid "Graphical alternative to git-commit"
msgstr "Grafiskt alternativ till git-commit"
-#: command-list.h:70
+#: command-list.h:71
msgid "Remove untracked files from the working tree"
msgstr "Ta bort ospårade filer från arbetskatalogen"
-#: command-list.h:71
+#: command-list.h:72
msgid "Clone a repository into a new directory"
msgstr "Klona ett arkiv till en ny katalog"
-#: command-list.h:72
+#: command-list.h:73
msgid "Display data in columns"
msgstr "Visa data i kolumner"
-#: command-list.h:73
+#: command-list.h:74
msgid "Record changes to the repository"
msgstr "Protokollför ändringar i arkivet"
-#: command-list.h:74
+#: command-list.h:75
msgid "Write and verify Git commit-graph files"
msgstr "Skriv och verifiera Git-incheckningsgraffiler"
-#: command-list.h:75
+#: command-list.h:76
msgid "Create a new commit object"
msgstr "Skapa ett nytt incheckningsobjekt"
-#: command-list.h:76
+#: command-list.h:77
msgid "Get and set repository or global options"
msgstr "Läs och skriv alternativ för arkiv eller globalt"
-#: command-list.h:77
+#: command-list.h:78
msgid "Count unpacked number of objects and their disk consumption"
msgstr "Räkna antal opackade objekt och mängd diskutrymme"
-#: command-list.h:78
+#: command-list.h:79
msgid "Retrieve and store user credentials"
msgstr "Hämta och spara användarreferenser"
-#: command-list.h:79
+#: command-list.h:80
msgid "Helper to temporarily store passwords in memory"
msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet"
-#: command-list.h:80
+#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "Hjälpprogram för att lagra användarreferenser på disk"
-#: command-list.h:81
+#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
msgstr "Exportera en enkel incheckning i en CVS-utcheckning"
-#: command-list.h:82
+#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
msgstr "Rädda dina data ut ur andra SCM folk älskar att hata"
-#: command-list.h:83
+#: command-list.h:84
msgid "A CVS server emulator for Git"
msgstr "En CVS-serveremulator för Git"
-#: command-list.h:84
+#: command-list.h:85
msgid "A really simple server for Git repositories"
msgstr "En riktigt enkel server för Git-arkiv"
-#: command-list.h:85
+#: command-list.h:86
msgid "Give an object a human readable name based on an available ref"
msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens"
-#: command-list.h:86
+#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
-#: command-list.h:87
+#: command-list.h:88
msgid "Compares files in the working tree and the index"
msgstr "Jämför filer i arbetskatalogen och indexet"
-#: command-list.h:88
+#: command-list.h:89
msgid "Compare a tree to the working tree or index"
msgstr "Jämför en träd med arbetskatalogen eller indexet"
-#: command-list.h:89
+#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt"
-#: command-list.h:90
+#: command-list.h:91
msgid "Show changes using common diff tools"
msgstr "Visa ändringar med vanliga diff-verktyg"
-#: command-list.h:91
+#: command-list.h:92
msgid "Git data exporter"
msgstr "Exporterare för Git-data"
-#: command-list.h:92
+#: command-list.h:93
msgid "Backend for fast Git data importers"
msgstr "Bakända för snabba Git-dataimporterare"
-#: command-list.h:93
+#: command-list.h:94
msgid "Download objects and refs from another repository"
msgstr "Hämta objekt och referenser från annat arkiv"
-#: command-list.h:94
+#: command-list.h:95
msgid "Receive missing objects from another repository"
msgstr "Ta emot saknade objekt från annat arkiv"
-#: command-list.h:95
+#: command-list.h:96
msgid "Rewrite branches"
msgstr "Skriv om grenar"
-#: command-list.h:96
+#: command-list.h:97
msgid "Produce a merge commit message"
msgstr "Skapa incheckningsmeddelande för en sammanslagning"
-#: command-list.h:97
+#: command-list.h:98
msgid "Output information on each ref"
msgstr "Visa information för varje referens"
-#: command-list.h:98
+#: command-list.h:99
msgid "Prepare patches for e-mail submission"
msgstr "Förbered patchar för insändning via e-post"
-#: command-list.h:99
+#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Bekräftar konnektivitet och validitet för objektet i databasen"
-#: command-list.h:100
+#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Städa onödiga filer och optimera det lokala arkivet"
-#: command-list.h:101
+#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive"
-#: command-list.h:102
+#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "Visa rader som motsvarar mönster"
-#: command-list.h:103
+#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "Ett portabelt grafiskt gränssnitt för Git"
-#: command-list.h:104
+#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil"
-#: command-list.h:105
+#: command-list.h:106
msgid "Display help information about Git"
msgstr "Visa hjälpinformation om Git"
-#: command-list.h:106
+#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "Serversideimplementation av Git över HTTP"
-#: command-list.h:107
+#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP"
-#: command-list.h:108
+#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"
-#: command-list.h:109
+#: command-list.h:110
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "Sänd en samling patchar från stdin till en IMAP-mapp"
-#: command-list.h:110
+#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"
-#: command-list.h:111
+#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
-#: command-list.h:112
+#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
-#: command-list.h:113
+#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr ""
"Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
-#: command-list.h:114
+#: command-list.h:115
msgid "The Git repository browser"
msgstr "Bläddraren för Git-arkiv"
-#: command-list.h:115
+#: command-list.h:116
msgid "Show commit logs"
msgstr "Visa incheckningsloggar"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "Visa information om filer i indexet och arbetskatalogen"
-#: command-list.h:117
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Lista referenser i ett fjärrarkiv"
-#: command-list.h:118
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Visa innehållet i ett trädobjekt"
-#: command-list.h:119
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"
-#: command-list.h:120
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Enkelt program för att dela en UNIX mbox"
-#: command-list.h:121
+#: command-list.h:122
msgid "Join two or more development histories together"
msgstr "Slå ihop två eller flera utvecklingshistorier"
-#: command-list.h:122
+#: command-list.h:123
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:124
msgid "Run a three-way file merge"
msgstr "Kör en trevägs-filsammanslagning"
-#: command-list.h:124
+#: command-list.h:125
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:126
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:127
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:128
msgid "Show three-way merge without touching index"
msgstr "Visa trevägssammanslagning utan att röra indexet"
-#: command-list.h:128
+#: command-list.h:129
msgid "Write and verify multi-pack-indexes"
msgstr "Skriv och verifiera multi-pack-index"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "Skapar ett taggobjekt"
-#: command-list.h:130
+#: command-list.h:131
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:132
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:133
msgid "Find symbolic names for given revs"
msgstr "Hitta symboliska namn för givna referenser"
-#: command-list.h:133
+#: command-list.h:134
msgid "Add or inspect object notes"
msgstr "Lägg till eller inspektera objektanteckningar"
-#: command-list.h:134
+#: command-list.h:135
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:136
msgid "Create a packed archive of objects"
msgstr "Skapa ett packat arkiv med objekt"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "Hitta redundanta pack-filer"
-#: command-list.h:137
+#: command-list.h:138
msgid "Pack heads and tags for efficient repository access"
msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
-#: command-list.h:138
+#: command-list.h:139
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:140
msgid "Compute unique ID for a patch"
msgstr "Beräkna unik ID för en patch"
-#: command-list.h:140
+#: command-list.h:141
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:142
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:143
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:144
msgid "Update remote refs along with associated objects"
msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
-#: command-list.h:144
+#: command-list.h:145
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:146
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:147
msgid "Reads tree information into the index"
msgstr "Läser trädinformation in i indexet"
-#: command-list.h:147
+#: command-list.h:148
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:149
msgid "Receive what is pushed into the repository"
msgstr "Ta emot det som sänds till arkivet"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Hantera referenslogg-information"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Hantera uppsättningen spårade arkiv"
-#: command-list.h:151
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Packa opackade objekt i ett arkiv"
-#: command-list.h:152
+#: command-list.h:153
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:154
msgid "Generates a summary of pending changes"
msgstr "Skapar en sammanfattning av väntande ändringar"
-#: command-list.h:154
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
-#: command-list.h:155
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Återställ aktuell HEAD till angivet tillstånd"
-#: command-list.h:156
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Återställ filer i arbetskatalogen"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "Återställ några befintliga incheckningar"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Plocka ut och massera parametrar"
-#: command-list.h:160
+#: command-list.h:161
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:162
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:163
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:164
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:165
msgid "Summarize 'git log' output"
msgstr "Summera \"git log\"-utdata"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "Visa olika sorters objekt"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "Visa grenar och deras incheckningar"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "Skapa packat arkivindex"
-#: command-list.h:168
+#: command-list.h:169
msgid "List references in a local repository"
msgstr "Visa referenser i ett lokalt arkiv"
-#: command-list.h:169
+#: command-list.h:170
msgid "Git's i18n setup code for shell scripts"
msgstr "Git:s i18n-startkod för skalskript"
-#: command-list.h:170
+#: command-list.h:171
msgid "Common Git shell script setup code"
msgstr "Gemensam skriptstartkod för Git"
-#: command-list.h:171
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Initiera och modifiera sparse-checkout"
-#: command-list.h:172
+#: command-list.h:173
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:174
msgid "Add file contents to the staging area"
msgstr "Lägg filinnehållet till indexet"
-#: command-list.h:174
+#: command-list.h:175
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Ta bort onödiga blanksteg"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Initiera, uppdatera eller inspektera undermoduler"
-#: command-list.h:177
+#: command-list.h:178
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:179
msgid "Switch branches"
msgstr "Byt gren"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Läs, modifiera eller ta bort symbolisk referens"
-#: command-list.h:180
+#: command-list.h:181
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:182
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:183
msgid "Unpack objects from a packed archive"
msgstr "Packa upp objekt från ett pakat arkiv"
-#: command-list.h:183
+#: command-list.h:184
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:185
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:186
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:187
msgid "Send archive back to git-archive"
msgstr "Sänd arkivet tillbaka till git-archive"
-#: command-list.h:187
+#: command-list.h:188
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:189
msgid "Show a Git logical variable"
msgstr "Visa en logisk Git-variabel"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Kontrollera GPG-signaturer för incheckningar"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Bekräfta packade Git-arkivfiler"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Kontrollera GPG-signaturer i taggar"
-#: command-list.h:192
+#: command-list.h:193
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:194
msgid "Show logs with difference each commit introduces"
msgstr "Visa loggar med differenser varje incheckning introducerar"
-#: command-list.h:194
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Hantera ytterligare arbetskataloger"
-#: command-list.h:195
+#: command-list.h:196
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:197
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Gits kommandoradsgränssnitt och -konventioner"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Grundläggande Git-handledning för utvecklare"
-#: command-list.h:199
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git för CVS-användare"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Justrea diff-utdata"
-#: command-list.h:201
+#: command-list.h:202
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:203
msgid "A Git Glossary"
msgstr "En Git-ordlista"
-#: command-list.h:203
+#: command-list.h:204
msgid "Hooks used by Git"
msgstr "Krokar som används av Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: command-list.h:205
+#: command-list.h:206
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: command-list.h:206
+#: command-list.h:207
msgid "Git namespaces"
msgstr "Git-namnrymder"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git Repository Layout"
msgstr "Gits arkivlayout"
-#: command-list.h:208
+#: command-list.h:209
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: command-list.h:209
+#: command-list.h:210
msgid "Mounting one repository inside another"
msgstr "Monterar ett arkiv inuti ett annat"
-#: command-list.h:210
+#: command-list.h:211
msgid "A tutorial introduction to Git: part two"
msgstr "Introduktion till Git: del två"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git"
msgstr "Introduktion till Git"
-#: command-list.h:212
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
@@ -23032,20 +23335,20 @@
msgid "cannot read $file for replaying"
msgstr "kan inte läsa $file för uppspelning"
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr "?? vad menar du?"
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr "bisect-körning misslyckades: inget kommando gavs."
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr "kör $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23054,11 +23357,11 @@
"\"bisect\"-körningen misslyckades:\n"
"felkod $res från \"$command\" är < 0 eller >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23067,11 +23370,11 @@
"\"bisect\"-körningen misslyckades:\n"
"\"bisect_state $state\" avslutades med felkoden $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr "\"bisect\"-körningen lyckades"
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr "Vi utför ingen bisect för tillfället."
@@ -23115,128 +23418,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:205
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:215
#, 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:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, 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:244
#, 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:275
#, 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:277
#, 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:285
#, 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:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23254,37 +23475,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:293
#, 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:305
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:308
+#: git-submodule.sh:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, 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:602
#, 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:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23293,7 +23514,7 @@
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23302,7 +23523,7 @@
"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
"direkt:"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23311,72 +23532,72 @@
"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:638
#, 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:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, 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:644
#, 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:649
#, 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:650
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:653
+#: git-submodule.sh:655
#, 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:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:896
+#: git-submodule.sh:878
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:948
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:971
+#: git-submodule.sh:953
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:974
+#: git-submodule.sh:956
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -23397,6 +23618,16 @@
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)"
@@ -24453,6 +24684,115 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ 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}"
@@ -24855,9 +25195,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"
diff --git a/po/tr.po b/po/tr.po
index 1748297..3d923d1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -89,8 +89,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: 2020-05-15 09:11+0800\n"
+"PO-Revision-Date: 2020-05-15 23:00+0300\n"
"Last-Translator: Emir SARI <bitigchi@me.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
"Language: tr\n"
@@ -104,9 +104,9 @@
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:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
msgid "could not read index"
msgstr "indeks okunamadı"
@@ -134,8 +134,7 @@
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:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
msgstr "indeks yazılamadı"
@@ -151,8 +150,8 @@
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:721 apply.c:4110 builtin/checkout.c:294
+#: 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"
@@ -275,11 +274,11 @@
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:1083 builtin/clean.c:816 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr "*** Komutlar ***"
-#: 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:1848
msgid "What now"
msgstr "Şimdi ne"
@@ -291,12 +290,13 @@
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
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr "yol"
@@ -304,27 +304,27 @@
msgid "could not refresh index"
msgstr "indeks yenilenemedi"
-#: 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:1765
#, c-format
msgid "Bye.\n"
msgstr "Hoşça kal.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -332,7 +332,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama için "
"imlenecektir."
-#: add-patch.c:40
+#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -346,22 +346,22 @@
"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:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -369,7 +369,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama için "
"imlenecektir."
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -383,22 +383,22 @@
"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:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -406,7 +406,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:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -420,22 +420,22 @@
"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:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -443,7 +443,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama için "
"imlenecektir."
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -457,25 +457,25 @@
"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
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -483,7 +483,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:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -497,23 +497,23 @@
"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:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -527,23 +527,23 @@
"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:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -557,7 +557,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:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -571,34 +571,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:319
#, 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:338 add-patch.c:342
#, 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:396
msgid "could not parse diff"
msgstr "diff ayrıştırılamadı"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "renklendirilmiş diff ayrıştırılamadı"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "'%s' çalıştırılamadı"
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -606,7 +606,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:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -615,7 +615,7 @@
"şurada bağlam satırı #%d bekleniyordu:\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -628,11 +628,11 @@
"\tşununla bitmiyor:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -646,7 +646,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:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -656,11 +656,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:1104
msgid "could not parse hunk header"
msgstr "parça üstbilgisi ayrıştırılamadı"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' başarısız oldu"
@@ -783,37 +783,46 @@
msgid "'git apply' failed"
msgstr "'git apply' başarısız oldu"
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın"
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sipucu: %.*s%s\n"
-#: advice.c:168
+#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Seç-al yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
-#: advice.c:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr "Gönderi yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr "Birleştirme yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr "Çekme yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr "Geriye alma yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
-#: advice.c:178
+#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
-#: advice.c:186
+#: 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."
@@ -821,23 +830,23 @@
"Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n"
"görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra bir gönderi yapın."
-#: advice.c:194
+#: advice.c:273
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:278 builtin/merge.c:1353
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:280
msgid "Please, commit your changes before merging."
msgstr "Birleştirme öncesinde değişikliklerinizi gönderin."
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1124,7 +1133,7 @@
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:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "%s okunamadı"
@@ -1321,7 +1330,7 @@
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:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr "%s açılamıyor"
@@ -1387,7 +1396,7 @@
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:4973 builtin/am.c:2259
msgid "num"
msgstr "sayı"
@@ -1443,7 +1452,7 @@
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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "yollar NUL karakteri ile ayrılır"
@@ -1451,9 +1460,9 @@
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:5008 builtin/am.c:2238 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:3458 builtin/rebase.c:1332
msgid "action"
msgstr "eylem"
@@ -1482,8 +1491,8 @@
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
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ayrıntı ver"
@@ -1495,7 +1504,7 @@
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:5032 builtin/am.c:2247
msgid "root"
msgstr "kök"
@@ -1503,141 +1512,6 @@
msgid "prepend <root> to all filenames"
msgstr "tüm dosya adlarının başına <kök> ekle"
-#: archive.c:14
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<seçenekler>] <ağacımsı> [<yol>...]"
-
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
-
-#: archive.c:16
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <depo> [--exec <komut>] [<sçnklr>] <ağacımsı> [<yol>...]"
-
-#: archive.c:17
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <depo> [--exec <komut>] --list"
-
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "böyle bir başvuru yok: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "geçerli bir nesne adı değil: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "bir ağaç nesnesi değil: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "geçerli çalışma dizini izlenmiyor"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "biçim"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "arşiv biçimi"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "önek"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "dosya"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "arşivi bu dosyaya yaz"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "çalışma dizinindeki .gitattributes'u oku"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "arşivlenmiş dosyaları stderr'de raporla"
-
-#: archive.c:465
-msgid "store only"
-msgstr "yalnızca depola"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "daha hızlı sıkıştır"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "daha iyi sıkıştır"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "desteklenen arşiv biçimlerini listele"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "depo"
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "arşivi uzak konum deposu <depo>'dan al"
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "komut"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "uzak konum komutu git-upload-archive'e olan yol"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "Beklenmedik seçenek --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Beklenmedik seçenek --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Bilinmeyen arşiv biçimi '%s'"
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "'%s' biçimi için desteklenmeyen değişken: -%d"
-
#: archive-tar.c:125 archive-zip.c:351
#, c-format
msgid "cannot stream blob %s"
@@ -1677,7 +1551,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "yol çok uzun (%d karakter, SHA1: %s): %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
#, c-format
msgid "deflate error (%d)"
msgstr "söndürme hatası (%d)"
@@ -1687,6 +1561,141 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>"
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<seçenekler>] <ağacımsı> [<yol>...]"
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <depo> [--exec <komut>] [<sçnklr>] <ağacımsı> [<yol>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <depo> [--exec <komut>] --list"
+
+#: archive.c:377 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:401
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "böyle bir başvuru yok: %.*s"
+
+#: archive.c:407
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "geçerli bir nesne adı değil: %s"
+
+#: archive.c:420
+#, c-format
+msgid "not a tree object: %s"
+msgstr "bir ağaç nesnesi değil: %s"
+
+#: archive.c:432
+msgid "current working directory is untracked"
+msgstr "geçerli çalışma dizini izlenmiyor"
+
+#: archive.c:464
+msgid "fmt"
+msgstr "biçim"
+
+#: archive.c:464
+msgid "archive format"
+msgstr "arşiv biçimi"
+
+#: archive.c:465 builtin/log.c:1674
+msgid "prefix"
+msgstr "önek"
+
+#: archive.c:466
+msgid "prepend prefix to each pathname in the archive"
+msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
+
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:190
+msgid "file"
+msgstr "dosya"
+
+#: archive.c:468 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "arşivi bu dosyaya yaz"
+
+#: archive.c:470
+msgid "read .gitattributes in working directory"
+msgstr "çalışma dizinindeki .gitattributes'u oku"
+
+#: archive.c:471
+msgid "report archived files on stderr"
+msgstr "arşivlenmiş dosyaları stderr'de raporla"
+
+#: archive.c:472
+msgid "store only"
+msgstr "yalnızca depola"
+
+#: archive.c:473
+msgid "compress faster"
+msgstr "daha hızlı sıkıştır"
+
+#: archive.c:481
+msgid "compress better"
+msgstr "daha iyi sıkıştır"
+
+#: archive.c:484
+msgid "list supported archive formats"
+msgstr "desteklenen arşiv biçimlerini listele"
+
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
+msgid "repo"
+msgstr "depo"
+
+#: archive.c:487 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "arşivi uzak konum deposu <depo>'dan al"
+
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "komut"
+
+#: archive.c:489 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:496
+msgid "Unexpected option --remote"
+msgstr "Beklenmedik seçenek --remote"
+
+#: archive.c:498
+msgid "Option --exec can only be used together with --remote"
+msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
+
+#: archive.c:500
+msgid "Unexpected option --output"
+msgstr "Beklenmedik seçenek --output"
+
+#: archive.c:522
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Bilinmeyen arşiv biçimi '%s'"
+
+#: archive.c:529
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "'%s' biçimi için desteklenmeyen değişken: -%d"
+
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1779,12 +1788,12 @@
msgid "a %s revision is needed"
msgstr "bir %s revizyonu gerekiyor"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "'%s' dosyası oluşturulamadı"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' dosyası okunamadı"
@@ -1824,40 +1833,40 @@
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"
-#: 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"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
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,12 +2004,12 @@
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ş"
@@ -2015,8 +2024,8 @@
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:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "'%s' açılamadı"
@@ -2068,7 +2077,7 @@
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:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "tanımlanamayan değişken: %s"
@@ -2091,18 +2100,300 @@
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:183
+msgid "commit-graph file is too small"
+msgstr "commit-graph dosyası pek küçük"
+
+#: commit-graph.c:248
+#, 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:255
+#, 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:262
+#, 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:284
+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:294
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "commit-graph biçimsiz iri parça ofseti %08x%08x"
+
+#: commit-graph.c:362
+#, 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:436
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph temel grafiği iri parçasına iye değil"
+
+#: commit-graph.c:446
+msgid "commit-graph chain does not match"
+msgstr "commit-graph zinciri eşleşmiyor"
+
+#: commit-graph.c:494
+#, 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:518
+msgid "unable to find all commit-graph files"
+msgstr "tüm commit-graph dosyaları bulunamıyor"
+
+#: commit-graph.c:651 commit-graph.c:711
+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:672
+#, c-format
+msgid "could not find commit %s"
+msgstr "%s gönderisi bulunamadı"
+
+#: commit-graph.c:948 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "%s gönderisi ayrıştırılamıyor"
+
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr "Değiştirilmiş yollar için Bloom süzgeçleri indeksi yazılıyor"
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr "Değiştirilmiş yollar için Bloom süzgeçleri verisi yazılıyor"
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "%s nesnesinin türü alınamıyor"
+
+#: commit-graph.c:1196
+msgid "Loading known commits in commit graph"
+msgstr "Gönderi grafiğindeki bilinen gönderiler yükleniyor"
+
+#: commit-graph.c:1213
+msgid "Expanding reachable commits in commit graph"
+msgstr "Gönderi grafiğindeki ulaşılabilir gönderiler genişletiliyor"
+
+#: commit-graph.c:1233
+msgid "Clearing commit marks in commit graph"
+msgstr "Gönderi grafiğindeki gönderi imleri temizleniyor"
+
+#: commit-graph.c:1252
+msgid "Computing commit graph generation numbers"
+msgstr "Gönderi grafiği kuşak sayıları hesaplanıyor"
+
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+"Geçerli gönderilerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor"
+
+#: commit-graph.c:1359
+#, 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:1372
+#, c-format
+msgid "error adding pack %s"
+msgstr "%s paketi eklenirken hata"
+
+#: commit-graph.c:1376
+#, c-format
+msgid "error opening index for %s"
+msgstr "%s için indeks açılırken hata"
+
+#: commit-graph.c:1405
+#, 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:1426
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr "geçersiz gönderi nesne numarası: %s"
+
+#: commit-graph.c:1442
+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:1457
+msgid "Counting distinct commits in commit graph"
+msgstr "Gönderi grafiğindeki belirgin gönderiler sayılıyor"
+
+#: commit-graph.c:1489
+msgid "Finding extra edges in commit graph"
+msgstr "Gönderi grafiğindeki ek sınırlar bulunuyor"
+
+#: commit-graph.c:1538
+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:1572 midx.c:812
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "%s öncü dizinleri oluşturulamıyor"
+
+#: commit-graph.c:1585
+msgid "unable to create temporary graph layer"
+msgstr "geçici grafik katmanı oluşturulamıyor"
+
+#: commit-graph.c:1590
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
+
+#: commit-graph.c:1667
+#, 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:1712
+msgid "unable to open commit-graph chain file"
+msgstr "commit-graph zincir dosyası açılamıyor"
+
+#: commit-graph.c:1728
+msgid "failed to rename base commit-graph file"
+msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
+
+#: commit-graph.c:1748
+msgid "failed to rename temporary commit-graph file"
+msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
+
+#: commit-graph.c:1874
+msgid "Scanning merged commits"
+msgstr "Birleştirilen gönderiler taranıyor"
+
+#: commit-graph.c:1885
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "beklenmedik yinelenmiş gönderi numarası %s"
+
+#: commit-graph.c:1908
+msgid "Merging commit-graph"
+msgstr "commit-graph birleştiriliyor"
+
+#: commit-graph.c:2096
+#, 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:2107
+msgid "too many commits to write graph"
+msgstr "grafik yazabilmek için çok fazla gönderi"
+
+#: commit-graph.c:2200
+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:2210
+#, 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:2220 commit-graph.c:2235
+#, 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:2227
+#, 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:2245
+msgid "Verifying commits in commit graph"
+msgstr "Gönderi grafiğindeki gönderiler doğrulanıyor"
+
+#: commit-graph.c:2259
+#, 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:2266
+#, 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:2276
+#, 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:2285
+#, 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:2298
+#, 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:2303
+#, 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:2307
+#, 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:2322
+#, 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:2328
+#, 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>"
+
+#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "%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!"
-#: 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,28 +2413,28 @@
"\"git config advice.graftFileDeprecated false\"\n"
"kullanarak bu iletiyi kapatabilirsiniz."
-#: commit.c:1153
+#: commit.c:1168
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"%s gönderisinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1157
+#: commit.c:1172
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s gönderisinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1160
+#: commit.c:1175
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s gönderisinin bir GPG imzası yok."
-#: commit.c:1163
+#: commit.c:1178
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s gönderisinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
-#: commit.c:1417
+#: commit.c:1432
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"
@@ -2154,276 +2445,11 @@
"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:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2438,297 +2464,297 @@
"\t%s\n"
"Bu dairesel içermelerden dolayı olabilir."
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "içerme yolu '%s' genişletilemedi"
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "anahtar bir bölüm içermiyor: %s"
-#: config.c:382
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr "anahtar bir değişken adı içermiyor: %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr "geçersiz anahtar: %s"
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "geçersiz anahtar (yenisatır): %s"
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "düzmece yapılandırma parametresi: %s"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "%s içinde düzmece biçim"
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "hatalı yapılandırma satırı %d, %s ikili nesnesi içinde"
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
-#: config.c:833
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "hatalı yapılandırma satırı %d, %s altmodül ikili nesnesi içinde"
-#: config.c:837
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "hatalı yapılandırma satırı %d, %s komut satırı içinde"
-#: config.c:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "hatalı yapılandırma satırı %d, %s içinde"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "erim dışı"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "geçersiz birim"
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için: %s"
-#: config.c:998
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s ikili nesnesi içinde: "
"%s"
-#: config.c:1001
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s dosyası içinde: %s"
-#: config.c:1004
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, standart girdi içinde: %s"
-#: config.c:1007
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s altmodül ikili "
"nesnesi içinde: %s"
-#: config.c:1010
+#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s komut satırı içinde: "
"%s"
-#: config.c:1013
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s içinde: %s"
-#: config.c:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
-#: config.c:1117
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "%s', '%s' için geçerli bir zaman damgası değil"
-#: config.c:1208
+#: config.c:1223
#, 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:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "hatalı zlib sıkıştırma düzeyi %d"
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "core.commentChar yalnızca bir karakter olmalı"
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "nesne oluşturma için geçersiz kip: %s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "%s için hatalı oluşturulmuş değer"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s için hatalı oluşturulmuş değer: %s"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3542
#, c-format
msgid "bad pack compression level %d"
msgstr "hatalı paket sıkıştırma düzeyi %d"
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "%s ayrıştırılamadı"
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "komut satırı yapılandırması ayrıştırılamıyor"
-#: config.c:2097
+#: config.c:2113
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:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Geçersiz %s: '%s'"
-#: config.c:2312
+#: config.c:2328
#, 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:2374
#, 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:2376
#, 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:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "geçersiz bölüm adı '%s'"
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "%s birden çok değere iye"
-#: config.c:2502
+#: config.c:2518
#, 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:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "%s yapılandırma dosyası kilitlenemedi"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "%s açılıyor"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "geçersiz dizgi: %s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "geçersiz yapılandırma dosyası %s"
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "%s üzerinde fstat başarısız oldu"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "'%s' mmap yapılamıyor"
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "%s üzerinde chmod başarısız oldu"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "%s yapılandırma dosyası yazılamadı"
-#: config.c:2977
+#: config.c:2993
#, 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:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' ayarı geri alınamadı"
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "geçersiz bölüm adı: %s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "'%s' için değer eksik"
@@ -2892,19 +2918,19 @@
msgid "unable to fork"
msgstr "çatallanamıyor"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Bağlantı denetleniyor"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list' çalıştırılamadı"
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "rev-list yazılamadı"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "rev-list'in stdin'i kapatılamadı"
@@ -3005,15 +3031,15 @@
msgid "external filter '%s' failed"
msgstr "'%s' dış süzgeci başarısız oldu"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "beklenmedik süzgeç türü"
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr "dış süzgeç için yol adı pek uzun"
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3021,20 +3047,48 @@
msgstr ""
"'%s' dış süzgeci artık kullanılamıyor, ancak tüm yolların süzümü bitmedi"
-#: convert.c:1223
+#: convert.c:1243
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:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: temiz süzgeç '%s' başarısız oldu"
-#: convert.c:1489
+#: convert.c:1511
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: kir 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:396
+#, 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:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url'nin bir düzeni yok: %s"
+
+#: credential.c:513
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "yetki url'si ayrıştırılamıyor: %s"
+
#: date.c:138
msgid "in the future"
msgstr "gelecekte"
@@ -3129,15 +3183,6 @@
msgid "Marked %d islands, done.\n"
msgstr "%d delta adası imlendi, bitti.\n"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "orderfile '%s' okunamadı"
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<seçenekler>] <yol> <yol>"
@@ -3199,35 +3244,35 @@
"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr "dış diff sonlandı, %s konumunda durdu"
-#: diff.c:4547
+#: diff.c:4583
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:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S ve --find-object birlikte kullanılmaz"
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
-#: diff.c:4676
+#: diff.c:4712
#, 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
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s bir sayısal değer bekliyor"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3236,42 +3281,42 @@
"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, 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:4858
#, 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:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "'%s' çözülemiyor"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s <n>/<m> biçimi bekliyor"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s bir karakter bekliyor, '%s' aldı"
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "hatalı --color-moved değişkeni: %s"
-#: diff.c:4944
+#: diff.c:4980
#, 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:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3279,157 +3324,157 @@
"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
"\"patience\" ve \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "%s için geçersiz değişken"
-#: diff.c:5178
+#: diff.c:5214
#, 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:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "hatalı --word-diff değişkeni: %s"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "Diff çıktısı biçimlendirme seçenekleri"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "yama oluştur"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "diff çıktısını gizle"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "diff'leri <n> satır bağlamlı oluştur"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "diff'i ham biçimde oluştur"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "'-p --raw eşanlamlısı"
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "'-p --stat eşanlamlısı"
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "makinede okunabilen --stat"
-#: diff.c:5287
+#: diff.c:5323
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:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5326
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:5330
msgid "synonym for --dirstat=cumulative"
msgstr "--dirstat-cumulative eşanlamlısı"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat=files,param1,param2... eşanlamlısı"
-#: diff.c:5302
+#: diff.c:5338
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:5341
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:5344
msgid "show only names of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını göster"
-#: diff.c:5311
+#: diff.c:5347
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:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "diffstat oluştur"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "<genişlik>"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr "<sayım>"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "diffstat'ı kısıtlı satırlarla oluştur"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "diffstat içinde ufak özet oluştur"
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr "uygulanabilir bir ikili diff çıktısı ver"
-#: diff.c:5335
+#: diff.c:5371
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:5373
msgid "show colored diff"
msgstr "renkli diff göster"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "<tür>"
-#: diff.c:5339
+#: diff.c:5375
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:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3437,88 +3482,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:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "<önek>"
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
-#: diff.c:5352
+#: diff.c:5388
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:5391
msgid "do not show any source or destination prefix"
msgstr "hiçbir kaynak ve hedef önekini gösterme"
-#: diff.c:5358
+#: diff.c:5394
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:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5363
+#: diff.c:5399
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:5404
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:5409
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:5412
msgid "Diff rename options"
msgstr "Diff yeniden adlandırma seçenekleri"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5414
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:5418
msgid "detect renames"
msgstr "yeniden adlandırmaları algıla"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "silmeler için öngörüntüyü atla"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "kopyaları algıla"
-#: diff.c:5393
+#: diff.c:5429
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:5431
msgid "disable rename detection"
msgstr "yeniden adlandırma algılamasını devre dışı bırak"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
-#: diff.c:5400
+#: diff.c:5436
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:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3526,218 +3571,218 @@
"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:5441
msgid "Diff algorithm options"
msgstr "Diff algoritma seçenekleri"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "olabilecek en küçük diff'i üret"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "satırları karşılaştırırken boşlukları yok say"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "boşluk sayısındaki değişiklikleri yok say"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "satır sonundaki boşluk değişikliklerini yok say"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "satır sonundaki satırbaşı karakterini yok say"
-#: diff.c:5422
+#: diff.c:5458
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:5461
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:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "bir diff algoritması seç"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "<metin>"
-#: diff.c:5438
+#: diff.c:5474
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:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "<kip>"
-#: diff.c:5441
+#: diff.c:5477
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
+#: diff.c:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "<ifade>"
-#: diff.c:5444
+#: diff.c:5480
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:5483
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:5486
msgid "moved lines of code are colored differently"
msgstr "taşınan kod satırları farklı renklendirilir"
-#: diff.c:5453
+#: diff.c:5489
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:5492
msgid "Other diff options"
msgstr "Diğer diff seçenekleri"
-#: diff.c:5458
+#: diff.c:5494
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:5498
msgid "treat all files as text"
msgstr "tüm dosyaları metin olarak varsay"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "iki girdiyi değiştir, diff'i tersine döndür"
-#: diff.c:5466
+#: diff.c:5502
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:5504
msgid "disable all output of the program"
msgstr "tüm program çıktısını devre dışı bırak"
-#: diff.c:5470
+#: diff.c:5506
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:5508
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:5510
msgid "<when>"
msgstr "<ne-zaman>"
-#: diff.c:5475
+#: diff.c:5511
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:5514
msgid "<format>"
msgstr "<biçim>"
-#: diff.c:5479
+#: diff.c:5515
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:5519
msgid "hide 'git add -N' entries from the index"
msgstr "indeksten 'git add -N' girdilerini gizle"
-#: diff.c:5486
+#: diff.c:5522
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:5524
msgid "<string>"
msgstr "<dizi>"
-#: diff.c:5489
+#: diff.c:5525
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:5528
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:5531
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:5534
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:5537
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:5538
msgid "<object-id>"
msgstr "<nesne-no>"
-#: diff.c:5503
+#: diff.c:5539
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:5541
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:5542
msgid "select files by diff type"
msgstr "dosyaları diff türüne göre seç"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "<dosya>"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "belirli bir dosyaya çıktı ver"
-#: diff.c:6164
+#: diff.c:6200
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:6203
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:6206
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3745,6 +3790,15 @@
"%s değişkeninizi en azından %d olarak ayarlamak ve komutu yeniden denemek "
"isteyebilirsiniz."
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "orderfile '%s' okunamadı"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3774,35 +3828,35 @@
msgid "cannot use %s as an exclude file"
msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "'%s' dizini açılamadı"
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "çekirdek adı ve bilgisi alınamadı"
-#: dir.c:2603
+#: dir.c:2699
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:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr "%s deposundaki indeks dosyası hasarlı"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "%s için dizinler oluşturulamadı"
-#: dir.c:3486
+#: dir.c:3560
#, 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"
@@ -3811,17 +3865,17 @@
msgid "Filtering content"
msgstr "İçerik süzülüyor"
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "hatalı git ad alanı yolu \"%s\""
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "GIT_DIR şuna ayarlanamadı: '%s'"
@@ -3831,244 +3885,244 @@
msgid "too many args to run %s"
msgstr "%s çalıştırmak için çok fazla değişken"
-#: fetch-pack.c:150
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: sığ bir liste bekleniyordu"
-#: fetch-pack.c:153
+#: fetch-pack.c:154
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:165
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:185
#, 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:196
msgid "unable to write to remote"
msgstr "uzak konuma yazılamıyor"
-#: fetch-pack.c:257
+#: fetch-pack.c:258
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:357 fetch-pack.c:1364
#, 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:363 fetch-pack.c:1370
#, 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:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr "nesne bulunamadı: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr "nesne içinde hata: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr "sığ bulunamadı: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s alındı"
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr "geçersiz gönderi %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr "vazgeçiliyor"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:340
msgid "done"
msgstr "bitti"
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s alındı"
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, c-format
msgid "Marking %s as complete"
msgstr "%s tamam olarak imleniyor"
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "%s halihazırda var (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:819
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:827
msgid "protocol error: bad pack header"
msgstr "protokol hatası: hatalı paket üstbilgisi"
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s ayrı çatallanamıyor"
-#: fetch-pack.c:916
+#: fetch-pack.c:917
#, c-format
msgid "%s failed"
msgstr "%s başarısız oldu"
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr "yanbant çoğullama çözücüsünde hata"
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, 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:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 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:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr "Sunucu %s destekliyor"
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr "Sunucu sığ istemcileri desteklemiyor"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr "Sunucu --shallow-since desteklemiyor"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr "Sunucu --shallow-exclude desteklemiyor"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr "Sunucu --deepen desteklemiyor"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr "ortak gönderi yok"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: getirme başarısız"
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr "Sunucu sığ istekleri desteklemiyor"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr "Sunucu süzgeç destekliyor"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr "uzak konuma istek yazılamıyor"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, c-format
msgid "error reading section header '%s'"
msgstr "bölüm üstbilgisi '%s' okunurken hata"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "beklenmedik alındı satırı: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr "alındılar işlenirken hata: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
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:1344
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:1386
#, c-format
msgid "error processing shallow info: %d"
msgstr "sığ bilgi işlenirken hata: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "beklenmedik wanted-ref: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, c-format
msgid "error processing wanted refs: %d"
msgstr "aranan başvurular işlenirken hata: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1789
msgid "no matching remote head"
msgstr "eşleşen uzak dal ucu yok"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "uzak konum gereken tüm nesneleri göndermedi"
-#: fetch-pack.c:1812
+#: fetch-pack.c:1839
#, c-format
msgid "no such remote ref %s"
msgstr "böyle bir uzak başvuru yok: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, 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:272
msgid "could not create temporary file"
msgstr "geçici dosya oluşturulamadı"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "şuna ayrık imza yazılamadı: '%s'"
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg veriyi imzalayamadı"
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4087,7 +4141,7 @@
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:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4108,7 +4162,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"
@@ -4163,7 +4218,7 @@
msgid "These are common Git commands used in various situations:"
msgstr "Çeşitli durumlarda kullanılan temel Git komutları aşağıdadır:"
-#: help.c:363 git.c:98
+#: help.c:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "desteklenmeyen komut listeleme türü '%s'"
@@ -4172,19 +4227,19 @@
msgid "The common Git guides are:"
msgstr "Yaygın Git kılavuzları:"
-#: help.c:512
+#: help.c:427
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:432
msgid "External commands"
msgstr "Dış komutlar"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "Komut armaları"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4193,32 +4248,32 @@
"'%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
+#: help.c:570
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Tüh. Sisteminiz hiçbir Git komutunu bildirmiyor."
-#: help.c:677
+#: help.c:592
#, 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
+#: help.c:597
#, 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
+#: help.c:602
#, 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:610
#, 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:614
msgid ""
"\n"
"The most similar command is"
@@ -4232,16 +4287,16 @@
"\n"
"Buna en yakın komutlar:"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git version [<seçenekler>]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4310,38 +4365,11 @@
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:436 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.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr ""
-"'%s' girdisi (%s ağacında) ikili nesne kipine iye, ancak bir ikili geniş "
-"nesne değil"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "%s gönderisi için kök ağacı yüklenemiyor"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
-
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr "'tree:<derinlik>' bekleniyordu"
@@ -4368,7 +4396,34 @@
msgid "multiple filter-specs cannot be combined"
msgstr "çoklu filter-specs birlikte kullanılamaz"
-#: lockfile.c:151
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye, ancak bir ağaç değil"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"'%s' girdisi (%s ağacında) ikili nesne kipine iye, ancak bir ikili geniş "
+"nesne değil"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "%s gönderisi için kök ağacı yüklenemiyor"
+
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4387,20 +4442,14 @@
"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ı"
-
-#: 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:109
+msgid "expected flush after ls-refs arguments"
+msgstr "ls-refs değişkenlerinden sonra floş bekleniyordu"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4717,7 +4766,7 @@
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
+#: merge-recursive.c:3089 git-submodule.sh:985
msgid "submodule"
msgstr "altmodül"
@@ -4835,10 +4884,20 @@
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:3774 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "İndeks yazılamadı."
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "önbellek okunamadı"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "yeni indeks dosyası yazılamıyor"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4890,107 +4949,115 @@
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:208
#, 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:258
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index bir 64 bit ofset depoluyor, ancak off_t pek küçük"
-#: midx.c:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr "paket dosyası multi-pack-index'ten hazırlanırken hata"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "paket dosyası '%s' eklenemedi"
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "pack-index '%s' açılamadı"
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "%d nesnesi paket dosyasında bulunamadı"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "bırakılacak pack-file %s görülmedi"
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr "indekslenecek paket dosyası yok."
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "İri parçalar multi-pack-index'e yazılıyor"
-#: midx.c:1052
+#: midx.c:1056
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "multi-pack-index %s konumunda temizlenemedi"
-#: midx.c:1108
+#: midx.c:1112
msgid "Looking for referenced packfiles"
msgstr "Başvurulmuş paket dosyaları aranıyor"
-#: midx.c:1123
+#: midx.c:1127
#, 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:1132
+msgid "the midx contains no oid"
+msgstr "midx bir oid içermiyor"
+
+#: midx.c:1141
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:1150
#, 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:1170
msgid "Sorting objects by packfile"
msgstr "Nesneler paket dosyasına göre sıralanıyor"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "Nesne ofsetleri doğrulanıyor"
-#: midx.c:1180
+#: midx.c:1193
#, 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:1199
#, 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:1208
#, 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:1233
msgid "Counting referenced objects"
msgstr "Başvurulmuş nesneler sayılıyor"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr "pack-objects başlatılamadı"
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr "pack-objects bitirilemedi"
@@ -5074,6 +5141,11 @@
msgid "hash mismatch %s"
msgstr "sağlama uyuşmazlığı %s"
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr "%s boyutu alınamıyor"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
@@ -5088,10 +5160,25 @@
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:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "hatalı oluşturulmuş nesne adı '%s'"
#: parse-options.c:38
#, c-format
@@ -5133,26 +5220,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:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "şunun arması: --%s"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "bilinmeyen seçenek '%s'"
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "bilinmeyen anahtar '%c'"
-#: parse-options.c:861
+#: parse-options.c:858
#, 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:882
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "kullanım: %s"
@@ -5160,45 +5252,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr " veya: %s"
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
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 +5324,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"
@@ -5316,7 +5383,7 @@
#: pkt-line.c:303
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
#, c-format
@@ -5342,7 +5409,7 @@
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:982
msgid "unable to parse --pretty format"
msgstr "--pretty biçimi ayrıştırılamıyor"
@@ -5355,29 +5422,42 @@
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:77
msgid "could not start `log`"
msgstr "'log' başlatılamadı"
-#: range-diff.c:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr "'log' çıktısı okunamadı"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr "'%s' gönderisi ayrıştırılamadı"
-#: 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 ""
+"'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: "
+"'%s'"
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
-#: range-diff.c:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr "diff oluşturulamadı"
-#: 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 "'%s' günlüğü ayrıştırılamadı"
@@ -5424,7 +5504,7 @@
#: read-cache.c:1536
msgid "Refresh index"
-msgstr "İndeksi yenile"
+msgstr "İndeks yenileniyor"
#: read-cache.c:1651
#, c-format
@@ -5494,9 +5574,9 @@
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "indeks dosyası hasar görmüş"
@@ -5551,12 +5631,12 @@
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:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr "'%s' kapatılamadı"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "'%s' bilgileri alınamadı"
@@ -5690,14 +5770,14 @@
"Eğer ki, her şeyi kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, 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:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "'%s' yazılamadı."
@@ -5728,133 +5808,14 @@
"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:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, 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:1936
msgid "gone"
msgstr "gitti"
@@ -6040,114 +6001,233 @@
msgid "malformed format string %s"
msgstr "hatalı oluşturulmuş biçim dizisi %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "dal yok, %s yeniden temellendiriliyor"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "dal yok, ayrık HEAD %s yeniden temellendiriliyor"
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "dal yok, ikili arama %s üzerinde başladı"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "dal yok"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "eksik nesne %s (%s için)"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, 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:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, 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:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "bozuk başvuru %s yok sayılıyor"
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr "biçim: %%(end) ögeciği eksik"
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "'%s' seçeneği --merged ile uyumsuz"
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, 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:2508
#, c-format
msgid "malformed object name %s"
msgstr "hatalı oluşturulmuş nesne adı %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr "'%s' bir gönderiye işaret etmeli"
-#: remote.c:366
+#: 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:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "sarkan sembolik başvuru %s yok sayılıyor"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "'%s' yazma için açılamadı: %s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "'%s' başvurusu okunamadı"
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "'%s' başvurusu halihazırda var"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "'%s' yazılırken beklenmedik nesne numarası"
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "şuraya yazılamadı: '%s'"
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s' yazma için açılamadı"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "'%s' silinirken beklenmedik nesne numarası"
+
+#: refs.c:954
+#, 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:960
+#, 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:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s için olan günlük boş"
+
+#: refs.c:1111
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
+
+#: refs.c:1187
+#, 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:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' mevcut; '%s' oluşturulamıyor"
+
+#: refs.c:2113 refs.c:2148
+#, 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'"
+
+#: remote.c:355
#, 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:403
msgid "more than one receivepack given, using the first"
msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
-#: remote.c:422
+#: remote.c:411
msgid "more than one uploadpack given, using the first"
msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
-#: remote.c:612
+#: remote.c:594
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Hem %s hem %s şuraya getirilemiyor: %s"
-#: remote.c:616
+#: remote.c:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s genelde %s ögesini izler, %s değil"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hem %s hem %s ögelerini izler"
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "dizginin '%s' anahtarında'*' yoktu"
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "dizginin '%s' değerinde '*' yok"
-#: remote.c:1004
+#: remote.c:986
#, 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:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
@@ -6156,7 +6236,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6180,7 +6260,7 @@
"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
"nitelendirmelisiniz."
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6191,7 +6271,7 @@
"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
"oluşturmak istediniz?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6202,7 +6282,7 @@
"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
"oluşturmak istediniz?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6213,7 +6293,7 @@
"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
"etiketlemek istediniz?"
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6224,114 +6304,114 @@
"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
"etiketlemek istediniz?"
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s dala çözülemiyor"
-#: remote.c:1106
+#: remote.c:1088
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "'%s' silinemiyor: uzak başvuru yok"
-#: remote.c:1118
+#: remote.c:1100
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "hedef başvuru belirteci %s birden fazlası ile eşleşiyor"
-#: remote.c:1125
+#: remote.c:1107
#, 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:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "HEAD bir dala işaret etmiyor"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "böyle bir dal yok: '%s'"
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' dalı için üstkaynak yapılandırması yok"
-#: remote.c:1646
+#: remote.c:1628
#, 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:1643
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "itme hedefi '%s' ('%s' uzak konumunda) yerel izleme dalına iye değil"
-#: remote.c:1673
+#: remote.c:1655
#, 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:1665
#, 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:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr "itilecek bir hedef yok (push.default: 'nothing')"
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr "tek bir konuma 'simple' itme çözülemiyor"
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "uzak başvuru %s bulunamadı"
-#: remote.c:1857
+#: remote.c:1839
#, 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:2002
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Dalınız '%s' temelli, ancak üstkaynak gitmiş.\n"
-#: remote.c:2024
+#: remote.c:2006
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:2009
#, 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:2013
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Sizin dalınız ve '%s' başka gönderilere başvuruyor.\n"
-#: remote.c:2034
+#: remote.c:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (ayrıntılar için \"%s\" kullanın)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Dalınız '%s' dalından %d gönderi ileride.\n"
msgstr[1] "Dalınız '%s' dalından %d gönderi ileride.\n"
-#: remote.c:2044
+#: remote.c:2026
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (yerel gönderilerinizi yayımlamak için \"git push\" kullanın)\n"
-#: remote.c:2047
+#: remote.c:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6339,11 +6419,11 @@
msgstr[0] "Dalınız '%s' dalından %d gönderi geride ve ileri sarılabilir.\n"
msgstr[1] "Dalınız '%s' dalından %d gönderi geride ve ileri sarılabilir.\n"
-#: remote.c:2055
+#: remote.c:2037
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:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6358,11 +6438,11 @@
"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
"her birinde %d ve %d gönderi var.\n"
-#: remote.c:2068
+#: remote.c:2050
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:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
@@ -6382,6 +6462,11 @@
msgid "replace depth too high for object %s"
msgstr "%s nesnesi için değiştirme derinliği pek yüksek"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "%s sağlama algoritması bu yapımda desteklenmiyor."
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "hasar görmüş MERGE_RR"
@@ -6440,7 +6525,7 @@
msgid "Recorded preimage for '%s'"
msgstr "'%s' için öngörüntü kaydedildi"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6475,20 +6560,29 @@
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:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "%s ögesinin ağacı bulunamadı"
+
+#: revision.c:2655
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:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "geçerli dalınız '%s' içinde henüz bir gönderi yok"
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent, --bisect ile uyumsuz"
-#: revision.c:2712
+#: revision.c:2870
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"
@@ -6510,29 +6604,29 @@
"'%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:145
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:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "uzak konum açım durumu ayrıştırılamadı: %s"
-#: send-pack.c:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "uzak konum açımı başarısız: %s"
-#: send-pack.c:309
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "itme sertifikası imzalanamadı"
-#: send-pack.c:423
+#: send-pack.c:399
msgid "the receiving end does not support --signed push"
msgstr "alıcı uç --signed itmeyi desteklemiyor"
-#: send-pack.c:425
+#: send-pack.c:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6540,47 +6634,47 @@
"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
"gönderilmiyor"
-#: send-pack.c:437
+#: send-pack.c:413
msgid "the receiving end does not support --atomic push"
msgstr "alıcı uç --atomic itmeyi desteklemiyor"
-#: send-pack.c:442
+#: send-pack.c:418
msgid "the receiving end does not support push options"
msgstr "alıcı uç itme seçeneklerini desteklemiyor"
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "geçersiz gönderi iletisi temizleme kipi '%s'"
-#: sequencer.c:296
+#: sequencer.c:297
#, 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:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "'%s' kaldırılamadı"
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr "geri al"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr "seç-al"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "yeniden temellendir"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "bilinmeyen eylem: %d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6588,7 +6682,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:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6598,44 +6692,43 @@
"veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n"
"'git commit' ile gönderin"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "'%s' kilitlenemedi"
-#: sequencer.c:412
+#: sequencer.c:413
#, 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:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, 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
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr "'%s' okunamadı"
-#: sequencer.c:466
+#: sequencer.c:457
#, 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:461
msgid "commit your changes or stash them to proceed."
msgstr "İlerlemek için değişikliklerinizi gönderin veya zulalayın."
-#: sequencer.c:502
+#: sequencer.c:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s: ileri sar"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Geçersiz temizlik kipi %s"
@@ -6643,65 +6736,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "önbellek ağacı güncellenemiyor"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "HEAD gönderisi çözülemedi"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "'%.*s' içinde bir anahtar yok"
-#: sequencer.c:757
+#: sequencer.c:748
#, 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:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s' okuma için açılamadı"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "bilinmeyen değişken '%s'"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' eksik"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' eksik"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' eksik"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6730,11 +6823,11 @@
"\n"
"\tgit rebase --continue komutu ile sürdürün.\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' başarısız oldu"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6760,7 +6853,7 @@
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6784,324 +6877,329 @@
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "yeni oluşturulan gönderi aranamadı"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "yeni oluşturulan gönderi ayrıştırılamadı"
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr "HEAD, gönderi oluşturduktan sonra çözülemiyor"
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr "ayrık HEAD"
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (kök gönderi)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "HEAD ayrıştırılamadı"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s bir gönderi değil"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr "HEAD gönderisi ayrıştırılamadı"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
msgid "unable to parse commit author"
msgstr "gönderi yazarı ayrıştırılamıyor"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695
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:1379 sequencer.c:1450
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "'%s' konumundan gönderi iletisi okunamıyor"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr "gönderi nesnesi yazılamadı"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "%s güncellenemedi"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "%s gönderisi ayrıştırılamadı"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, c-format
msgid "could not parse parent commit %s"
msgstr "üst gönderi %s ayrıştırılamadı"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "bilinmeyen komut: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr "Bu %d gönderinin bir birleşimi."
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr "düzeltmek için bir HEAD gerekiyor"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "HEAD okunamadı"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr "HEAD'in gönderi iletisi okunamadı"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "'%s' yazılamıyor"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Birinci gönderi iletisi bu:"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, c-format
msgid "could not read commit message of %s"
msgstr "%s gönderi iletisi okunamadı"
-#: sequencer.c:1662
+#: sequencer.c:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "Gönderi iletisi #%d bu:"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Gönderi iletisi #%d atlanacak:"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "indeks dosyanız birleştirilmemiş"
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "kök gönderi düzeltilemiyor"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "%s gönderisi bir birleştirme, ancak bir -m seçeneği verilmedi."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr "%s gönderisinin %d diye bir üst ögesi yok"
-#: sequencer.c:1804
+#: sequencer.c:1811
#, c-format
msgid "cannot get commit message for %s"
msgstr "%s gönderi iletisi alınamıyor"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: üst gönderi %s ayrıştırılamıyor"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "%s geri alınamadı... %s"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "%s uygulanamadı... %s"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, 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:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: indeks okunamadı"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: indeks yenilenemedi"
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s değişken kabul etmiyor: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "%s için eksik değişken"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "'%s' ayrıştırılamadı"
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "geçersiz satır %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "öncesinde bir gönderi olmadan '%s' yapılamıyor"
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr "sürmekte olan bir seç-al iptal ediliyor"
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "sürmekte olan bir geri al iptal ediliyor"
-#: sequencer.c:2349
+#: sequencer.c:2361
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:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "Hiçbir gönderi ayrıştırılmadı."
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr "bir geri al sırasında seç-al yapılamıyor"
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "bir seç-al sırasında geri al yapılamıyor"
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s için geçersiz değer: %s"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "kullanılabilir olmayan squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "boş gönderi seti aktarıldı"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "geri al halihazırda sürüyor"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "seç-al halihazırda sürüyor"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, 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:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr "HEAD kilitlenemedi"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
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:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "HEAD çözülemiyor"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
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:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "'%s' açılamıyor"
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s' okunamıyor: %s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "beklenmedik dosya sonu"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, 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:2830
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:2871
msgid "no revert in progress"
msgstr "süren bir geri al yok"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "süren bir seç-al yok"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "gönderi atlanamadı"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "atlanacak bir şey yok"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -7110,21 +7208,16 @@
"Gönderiyi yaptınız mı?\n"
"\"git %s --continue\" deneyin.\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "%s güncellenemedi"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamıyor"
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7143,22 +7236,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "%s uygulanamıyor... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, c-format
msgid "Could not merge %.*s"
msgstr "%.*s birleştirilemedi"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamadı"
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Çalıştırılıyor: %s\n"
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7173,11 +7271,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
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:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7194,102 +7292,128 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "izin verilmeyen etiket adı: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "sahte kök gönderi yazılıyor"
-#: sequencer.c:3261
+#: sequencer.c:3279
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:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "'%s' çözülemedi"
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "güncel bir revizyon olmadan birleştirilemiyor"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "'%.*s' ayrıştırılamıyor"
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "birleştirilecek bir şey yok: '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3437
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:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr "'%s' gönderisinin gönderi iletisi alınamadı"
-#: sequencer.c:3594
+#: sequencer.c:3613
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3629
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:3703
+msgid "Cannot autostash"
+msgstr "Kendiliğinden zulalanamıyor"
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Beklenmedik zula yanıtı: '%s'"
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "'%s' için dizin oluşturulamadı"
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Zula kendiliğinden oluşturuldu: %s\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "'reset --hard' yapılamadı"
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "Kendiliğinden zulalama uygulandı.\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, 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:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"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
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: geçerli bir OID değil"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "HEAD'de duruldu\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "%s konumunda duruldu\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7310,48 +7434,58 @@
"\tgit rebase --edit-todo\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
+
+#: sequencer.c:3976
#, 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:4047
#, c-format
msgid "unknown command %d"
msgstr "bilinmeyen komut %d"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "orig-head okunamadı"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "'onto' okunamadı"
-#: sequencer.c:4018
+#: sequencer.c:4125
#, 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:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "var olmayan gönderi değiştirilemiyor"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "geçersiz dosya: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "geçersiz içerik: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7361,59 +7495,59 @@
"Çalışma ağacınızda gönderilmemiş değişiklikleriniz var. Lütfen önce\n"
"onları gönderin ve ardından 'git rebase --continue' yapın."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "dosya yazılamadı: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "Hazırlanmış değişiklikler gönderilemedi."
-#: sequencer.c:4338
+#: sequencer.c:4446
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: Bir %s seçip alınamıyor"
-#: sequencer.c:4342
+#: sequencer.c:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s hatalı revizyon"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "ilk gönderi geri alınamaz"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script: ele alınmayan seçenekler"
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr "make_script: revizyonlar hazırlanırken hata"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "yapılacak bir şey yok"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "gerekli olmayan seçim komutları atlanamadı"
-#: sequencer.c:5213
+#: sequencer.c:5336
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,7 +7556,7 @@
"%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"
@@ -7434,12 +7568,12 @@
"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"
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7450,92 +7584,92 @@
"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:569
#, 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:577
msgid "unknown repository extensions found:"
msgstr "bilinmeyen depo genişletmeleri bulundu:"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "'%s' açılırken hata"
-#: setup.c:588
+#: setup.c:598
#, 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:600
#, c-format
msgid "error reading %s"
msgstr "%s okunurken hata"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "geçersiz gitfile biçimi: %s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "gitfile içinde yol yok: %s"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "bir git deposu değil: %s"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' çok büyük"
-#: setup.c:709
+#: setup.c:722
#, 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:751 setup.c:753 setup.c:784
#, 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:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "cwd'ye geri dönülemiyor"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "'%*s%s%s' bilgileri alınamadı"
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr "Şu anki çalışma dizini okunamıyor"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "şuraya değiştirilemiyor: '%s'"
-#: setup.c:1128
+#: setup.c:1141
#, 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:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7545,7 +7679,7 @@
"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"ayarlanmamış)."
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7554,269 +7688,269 @@
"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:1304
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:1319
msgid "fork failed"
msgstr "çatallama başarısız"
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr "setsid başarısız"
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
-#: sha1-file.c:575
+#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin"
-#: sha1-file.c:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "nesne dizini olağanlaştırılamıyor: %s"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "alternatifler dosyası okunamıyor"
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "yeni alternatifler dosyası yerine taşınamıyor"
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "'%s' diye bir yol yok"
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor."
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Başvuru deposu '%s' yerel bir depo değil."
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "başvuru deposu '%s' sığ"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "başvuru deposu '%s' aşılı"
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "mmap başarısız"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "nesne dosyası %s boş"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr "hasar görmüş gevşek nesne '%s'"
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gevşek nesne '%s' sonunda anlamsız veri"
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "geçersiz nesne türü"
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor"
-#: sha1-file.c:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "%s üstbilgisi açılamıyor"
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor"
-#: sha1-file.c:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr "%s nesnesi okunamadı"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s yedeği %s için bulunamadı"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, 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
+#: sha1-file.c:1652
#, 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
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr "%s dosyası yazılamıyor"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "'%s' ögesine izin ayarlanamıyor"
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "dosya yazım hatası"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "gevşek nesne dosyası kapatılırken hata"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, 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
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr "geçici dosya oluşturulamıyor"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "gevşek nesne dosyası yazılamıyor"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "yeni nesne %s söndürülemiyor (%d)"
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, 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
+#: sha1-file.c:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr "%s üzerinde utime() başarısız"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "%s için nesne okunamıyor"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "hasar görmüş gönderi"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "hasar görmüş etiket"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "%s indekslenirken okuma hatası"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr "%s indekslenirken kısa read"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: veritabanına ekleme başarısız"
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: desteklenmeyen dosya türü"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "%s geçerli bir nesne değil"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, 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
+#: sha1-file.c:2275 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
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "%s mmap yapılamadı"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "%s üstbilgisi açılamıyor"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "%s içeriği açılamıyor"
@@ -7920,43 +8054,43 @@
msgstr "geçersiz nesne adı: '%.*s'"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, 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:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, 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:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, 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:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7964,18 +8098,43 @@
msgstr[1] "%u bayt"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, 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:1180
#, 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 ""
@@ -8039,7 +8198,7 @@
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:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
@@ -8154,40 +8313,15 @@
"şuradan: '%s'\n"
"şuraya: '%s'\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "ls-files şurada başlatılamadı .."
-#: submodule.c:2248
+#: submodule.c:2250
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "kuşku doğuran altmodül yok sayılıyor: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs için negatif değerlere izin verilmiyor"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"'%s' bir komut satırı seçeneği olarak yorumlanabileceğinden yok sayılıyor: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "%s için geçersiz değer"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ".gitmodules girdisi %s güncellenemedi"
-
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
@@ -8242,99 +8376,6 @@
msgid "could not rename temporary file to %s"
msgstr "geçici dosya adı %s olarak değiştirilemedi"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "'%s' demeti okunamadı"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: Geçersiz derinlik seçeneği '%s'"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "transport.color.* yapılandırması ayrıştırılamadı"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "protokol v2 desteği henüz yerine getirilmedi"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "'%s' taşıyıcısına izin verilmiyor"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync artık desteklenmiyor"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
-"değişiklikler içeriyor:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Lütfen\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"deneyin veya bir uzak konuma itmek için yola cd yapıp\n"
-"\n"
-"\tgit push\n"
-"\n"
-"kullanın.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "İptal ediliyor"
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "gereken tüm altmodüller itilemedi"
-
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "işlem protokol tarafından desteklenmiyor"
-
#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr "uzak konum yardımcısına tam yazım başarısız"
@@ -8379,7 +8420,7 @@
msgid "error while running fast-import"
msgstr "fast-import çalıştırılırken hata"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "%s başvurusu okunamadı"
@@ -8397,6 +8438,10 @@
msgid "invalid remote service path"
msgstr "geçersiz uzak konum servis yolu"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "işlem protokol tarafından desteklenmiyor"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8437,24 +8482,24 @@
msgid "helper %s does not support 'push-option'"
msgstr "%s yardımcısı 'push-option' desteklemiyor"
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr "%s yardımcısı 'force' desteklemiyor"
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "fast-export çalıştırılamadı"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "fast-export çalıştırılırken hata"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8463,50 +8508,139 @@
"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
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) başarısız oldu"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) başarısız oldu"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "%s iş parçacığı başarısız oldu"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s iş parçacığı eklenemedi: %s"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, 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
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "%s işlemi bekleyemedi"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "%s işlemi başarısız oldu"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
msgid "can't start thread for copying data"
msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "'%s' demeti okunamadı"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: Geçersiz derinlik seçeneği '%s'"
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın"
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "transport.color.* yapılandırması ayrıştırılamadı"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "protokol v2 desteği henüz yerine getirilmedi"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "'%s' taşıyıcısına izin verilmiyor"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync artık desteklenmiyor"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
+"değişiklikler içeriyor:\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Lütfen\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"deneyin veya bir uzak konuma itmek için yola cd yapıp\n"
+"\n"
+"\tgit push\n"
+"\n"
+"kullanın.\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "İptal ediliyor"
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "gereken tüm altmodüller itilemedi"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "ağaç nesnesi çok kısa"
@@ -8523,7 +8657,7 @@
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"
@@ -8533,7 +8667,7 @@
"yazılacak:\n"
"%%sLütfen dal değiştirmeden önce değişikliklerinizi gönderin 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"
@@ -8543,7 +8677,7 @@
"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"
@@ -8553,7 +8687,7 @@
"yazılacak:\n"
"%%sLütfen birleştirmeden önce değişikliklerinizi gönderin 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,7 +8697,7 @@
"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"
@@ -8572,7 +8706,7 @@
"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%sLütfen %s yapmadan önce değişikliklerinizi gönderin veya zulalayın."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8581,7 +8715,7 @@
"%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"
@@ -8591,7 +8725,7 @@
"kaybedilecek:\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"
@@ -8600,25 +8734,25 @@
"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%s"
-
#: unpack-trees.c:136
#, c-format
msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış yapılarak 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 +8761,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 +8770,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,7 +8779,7 @@
"%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 "
@@ -8656,7 +8790,7 @@
"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 "
@@ -8667,7 +8801,7 @@
"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 +8811,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 +8821,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 +8830,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 +8839,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 +8853,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 +8911,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:1337
+msgid "expected flush after fetch arguments"
+msgstr "getir değişkenlerinden sonra floş bekleniyordu"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "geçersiz URL şeması veya eksik '://' eki"
@@ -8806,32 +8952,32 @@
msgid "Fetching objects"
msgstr "Nesneler getiriliyor"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "'%s' okunamadı"
-#: worktree.c:305
+#: worktree.c:309
#, 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:320
#, 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:332
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' mevcut değil"
-#: worktree.c:334
+#: worktree.c:338
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' bir .git dosyası değil, hata kodu %d"
-#: worktree.c:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' şuna geri işaret etmiyor: '%s'"
@@ -8884,18 +9030,17 @@
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:"
-#: 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:"
#: 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 " (gönderilecekleri güncellemek için \"git add <dosya>...\" kullanın)"
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
@@ -8990,22 +9135,22 @@
msgid "untracked content, "
msgstr "izlenmeyen içerik, "
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "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:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Gönderilecek 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 +9158,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,107 +9169,107 @@
"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."
-#: 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'."
@@ -9132,179 +9277,179 @@
"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir gönderiyi "
"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."
-#: 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 "
"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."
-#: wt-status.c:1406
+#: wt-status.c:1404
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
+#: wt-status.c:1406
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."
-#: 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."
-#: 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
+#: wt-status.c:1692
msgid "On branch "
-msgstr "Şu dalda: "
+msgstr "Üzerinde bulunulan dal: "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "şunun üzerine yeniden temellendirme sürmekte: "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "Şu anda bir dal üzerinde değil."
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "İlk gönderi"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "Henüz bir gönderi yok"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "İzlenmeyen dosyalar"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "Yok sayılan dosyalar"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, 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:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "İzlenmeyen dosyalar listelenmiyor%s"
-#: wt-status.c:1759
+#: wt-status.c:1757
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:1763
msgid "No changes"
msgstr "Değişiklik yok"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"Gönderiye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
"kullanın)\n"
-#: wt-status.c:1773
+#: wt-status.c:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "Gönderiye eklenen değişiklik yok\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9313,70 +9458,70 @@
"gönderiye bir şey eklenmedi ancak izlenmeyen dosyalar var (izlemek için\n"
"\"git add\" kullanın)\n"
-#: wt-status.c:1779
+#: wt-status.c:1777
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "gönderiye bir şey eklenmedi ancak izlenmeyen dosyalar var\n"
-#: wt-status.c:1782
+#: wt-status.c:1780
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"Gönderilecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için "
"\"git add\" kullanın)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "Gönderilecek bir şey yok\n"
-#: wt-status.c:1788
+#: wt-status.c:1786
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"Gönderilecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
-#: wt-status.c:1792
+#: wt-status.c:1790
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "Gönderilecek bir şey yok, çalışma ağacı temiz\n"
-#: wt-status.c:1905
+#: wt-status.c:1903
msgid "No commits yet on "
msgstr "Şurada henüz bir gönderi yok: "
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD (dal yok)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "değişik"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "şunun arkasında: "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "şunun önünde: "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, 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:2474
msgid "additionally, your index contains uncommitted changes."
msgstr "Ek olarak, indeksiniz gönderilmemiş değişiklikler içeriyor."
-#: wt-status.c:2478
+#: wt-status.c:2476
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s yapılamıyor: İndeksiniz gönderilmemiş değişiklikler içeriyor."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' bağlantısı kesilemedi"
@@ -9390,7 +9535,7 @@
msgid "unexpected diff status %c"
msgstr "beklenmedik diff durumu %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "dosyaları güncelleme başarısız"
@@ -9403,7 +9548,7 @@
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:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "İndeks okunamadı"
@@ -9440,8 +9585,8 @@
"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/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "sınama turu"
@@ -9450,7 +9595,7 @@
msgid "interactive picking"
msgstr "etkileşimli seçim"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "parçaları etkileşimli olarak seç"
@@ -9558,7 +9703,7 @@
msgid "adding files failed"
msgstr "dosya ekleme başarısız"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
@@ -9581,13 +9726,13 @@
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:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file yol belirteci değişkenleri ile uyumsuz"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
@@ -9749,35 +9894,35 @@
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:1699 builtin/commit.c:395
msgid "unable to write index file"
msgstr "indeks dosyası yazılamıyor"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
#, 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:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr "Uygulanıyor: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, 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:1770
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:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9787,7 +9932,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:1821
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 +9945,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:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' nesnesi ayrıştırılamadı."
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr "indeks temizlenemedi"
-#: builtin/am.c:2025
+#: builtin/am.c:2024
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9818,154 +9963,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:2131
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Geçersiz --patch-format değeri: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
#, 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:2175
#, 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:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr "etkileşimli olarak çalıştır"
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr "tarihi seçenek -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2217
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:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "sessiz ol"
-#: builtin/am.c:2221
+#: builtin/am.c:2220
msgid "add a Signed-off-by line to the commit message"
msgstr "gönderi iletisine bir Signed-off-by satırı ekle"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "recode into utf8 (default)"
msgstr "utf8 olarak yeniden kodla (öntanımlı)"
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr "'git-mailinfo'ya -k bayrağını geçir"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr "'git-mailinfo'ya -b bayrağını geçir"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr "'git-mailinfo'ya -m bayrağını geçir"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
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:2234
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:2237
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:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr "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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c: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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr "biçim"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr "yama biçimi"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
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:2271
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:2274
msgid "synonyms for --continue"
msgstr "--continue eşanlamlıları"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr "geçerli yamayı atla"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "restore the original branch and abort the patching operation."
msgstr "ilk dalı eski durumuna getir ve yamalama işlemini iptal et"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
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:2287
msgid "show the patch being applied"
msgstr "uygulanmakta olan yamayı göster"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr "gönderici tarihi hakkında yalan söyle"
-#: builtin/am.c:2295
+#: builtin/am.c:2294
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:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr "GPG imzalı gönderiler"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr "(git-rebase için iç kullanım)"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -9973,17 +10120,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:2325
msgid "failed to read the index"
msgstr "indeks okunamadı"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"Bir önceki yeniden temellendirme dizini %s hâlâ mevcut ancak mbox verildi."
-#: builtin/am.c:2365
+#: builtin/am.c:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9992,11 +10139,11 @@
"Başıboş %s dizini bulundu.\n"
"Kaldırmak için \"git am --abort\" kullanın."
-#: builtin/am.c:2371
+#: builtin/am.c:2370
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 "Yapılmakta olan bir çözüm işlemi yok, sürdürülmeyecek."
-#: builtin/am.c:2381
+#: builtin/am.c:2380
msgid "interactive mode requires patches on the command line"
msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
@@ -10405,7 +10552,7 @@
msgid "Ignore whitespace differences"
msgstr "boşluk ayrımlarını yok say"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr "revizyon"
@@ -10473,14 +10620,14 @@
msgid "4 years, 11 months ago"
msgstr "4 yıl 11 ay önce"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "%s 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:1133
msgid "Blaming lines"
msgstr "Genel bakış satırları"
@@ -10689,7 +10836,7 @@
msgid "do not use"
msgstr "kullanma"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "üstkaynak"
@@ -10781,68 +10928,68 @@
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: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 "nesne"
-#: builtin/branch.c:658
+#: builtin/branch.c:657
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:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir"
-#: builtin/branch.c: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 "çıktı için kullanılacak biçim"
-#: 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, refs/heads altında bulunamadı!"
-#: builtin/branch.c:708
+#: builtin/branch.c:706
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:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr "dal adı gerekli"
-#: builtin/branch.c:753
+#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
-#: builtin/branch.c:758
+#: builtin/branch.c:756
msgid "cannot edit description of more than one branch"
msgstr "birden çok dalın açıklaması düzenlenemiyor"
-#: builtin/branch.c:765
+#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "'%s' dalında henüz bir gönderi yok."
-#: builtin/branch.c:768
+#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr "'%s' adında bir dal yok."
-#: builtin/branch.c:783
+#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr "bir kopyalama işlemi için çok fazla dal"
-#: builtin/branch.c:792
+#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr "bir yeniden adlandırma işlemi için çok fazla değişken"
-#: builtin/branch.c:797
+#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr "yeni üstkaynak ayarlamak için çok fazla değişken"
-#: builtin/branch.c:801
+#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10850,31 +10997,31 @@
"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:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr "'%s' diye bir dal yok"
-#: builtin/branch.c:808
+#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' diye bir dal mevcut değil"
-#: builtin/branch.c:821
+#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr "üst kaynağı kaldırmak için çok fazla değişken"
-#: builtin/branch.c:825
+#: builtin/branch.c:823
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"HEAD'in üst kaynağı kaldırılamadı, çünkü herhangi bir dala işaret etmiyor."
-#: builtin/branch.c:831
+#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' dalının üstkaynak bilgisi yok"
-#: 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>?"
@@ -10882,7 +11029,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:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10906,19 +11053,19 @@
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:66 builtin/pack-objects.c:3376
msgid "do not show progress meter"
msgstr "ilerleme çubuğunu gösterme"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr "ilerleme çubuğunu göster"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
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:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer"
@@ -10948,7 +11095,7 @@
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,7 +11103,7 @@
"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]"
@@ -10964,72 +11111,72 @@
"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 "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"
-#: 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 git-submodule.sh:984
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 +11204,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:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "ilerleme bildirimini gizle"
@@ -11150,7 +11297,7 @@
#: 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/worktree.c:675
msgid "string"
msgstr "dizi"
@@ -11178,98 +11325,98 @@
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:256
#, 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:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "'%s' yolu: Birleştirilemiyor"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, 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:395
#, 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:400
#, 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:407
#, 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:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' güncellenmekte olan yollarla kullanılamaz"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s', %s ile birlikte kullanılamaz"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, 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:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ne '%s' ne de '%s' belirtilmiş"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, 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:463 builtin/checkout.c:468
#, 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:527 builtin/checkout.c:534
#, c-format
msgid "path '%s' is unmerged"
msgstr "'%s' yolu birleştirilmemiş"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:704
msgid "you need to resolve your current index first"
msgstr "önce geçerli indeksinizi çözmelisiniz"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11278,50 +11425,50 @@
"aşağıdaki hazırlanmış değişiklikler içeren dosyalarla sürdürülemiyor:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, 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:903
msgid "HEAD is now at"
-msgstr "HEAD şimdi şurada:"
+msgstr "HEAD konumu:"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "HEAD güncellenemiyor"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' dalı sıfırlandı.\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "Halihazırda '%s' üzerinde\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, 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:920 builtin/checkout.c:1344
#, 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:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' dalına geçildi.\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr "... ve %d daha.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11344,7 +11491,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11371,19 +11518,19 @@
"\tgit branch <yeni-dal-adı> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "revizyonlarda gezinirken iç hata"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr "Önceki HEAD konumu şuydu:"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
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:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11392,7 +11539,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:1159
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 +11559,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:1169
#, 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:1235
msgid "only one reference expected"
msgstr "yalnızca bir başvuru bekleniyordu"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, 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:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "geçersiz başvuru: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, 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:1358
#, 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:1360
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "bir dal bekleniyordu, '%s' uzak dal alındı"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "bir dal bekleniyordu, '%s' alındı"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "bir dal bekleniyordu, '%s' gönderisi alındı"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11464,7 +11611,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:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11472,7 +11619,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:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11480,7 +11627,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:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11488,7 +11635,7 @@
"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:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11496,143 +11643,145 @@
"Geri 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:1400
msgid "you are switching branch while bisecting"
msgstr "ikili arama yaparken dal değiştiriyorsunuz"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
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:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s', '%s' ile birlikte kullanılamaz"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s', <başlama-noktası> alamaz"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Dal gönderi olmayan '%s' ögesine değiştirilemez"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1450
msgid "missing branch or commit argument"
msgstr "dal veya gönderi değişkeni eksik"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "durum belirtmeyi zorla"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
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:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "adı verilen gönderide HEAD'i ayır"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr "yeni dal için üstkaynak bilgisi ayarla"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "yeni dal"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "yeni üst ögesi olmayan dal"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
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:1530
msgid "checkout our version for unmerged files"
msgstr "birleştirilmeyen dosyalar için bizim sürümü çıkış yap"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1533
msgid "checkout their version for unmerged files"
msgstr "birleştirilmeyen dosyalar için onların sürümünü çıkış yap"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
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:1592
+#, 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:1596
msgid "-p and --overlay are mutually exclusive"
msgstr "-p ve --overlay birlikte kullanılmaz"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
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:1638
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "eksik dal adı; -%c deneyin"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr "%s çözülemedi"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr "geçersiz yol belirtimi"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bir gönderi değil ve ondan bir '%s' dalı oluşturulamaz"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1697
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach bir '%s' yol değişkeni almıyor"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1706
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:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file, --patch ile uyumsuz"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11640,109 +11789,109 @@
"git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
"birlikte kullanılamaz"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1725
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:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "dal"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
msgstr "yeni bir dal oluştur ve çıkış yap"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
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:1755
msgid "create reflog for new branch"
msgstr "yeni dal için başvuru günlüğü oluştur"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
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:1758
msgid "use overlay mode (default)"
msgstr "yerpaylaşım kipini kullan (öntanımlı)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
msgid "create and switch to a new branch"
msgstr "yeni bir dal oluştur ve ona geç"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1805
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:1807
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:1809
msgid "throw away local modifications"
msgstr "yerel değişiklikleri çöpe at"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
msgstr "çıkış yapılacak ağacımsı"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr "indeksi eski durumuna getir"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr "çalışma ağacını eski durumuna getir"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr "birleştirilmemiş girdileri yok say"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
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:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -11755,7 +11904,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:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -11781,27 +11930,27 @@
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>> "
-#: 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,56 +11968,56 @@
"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:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "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
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr "-x ve -X birlikte kullanılamaz"
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -11876,7 +12025,7 @@
"clean.requireForce 'true' olarak ayarlanmış ve ne -i, ne -n, ne de -f "
"verilmiş; temizleme reddediliyor"
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11892,7 +12041,7 @@
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:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr "çıplak bir depo oluştur"
@@ -11912,11 +12061,11 @@
msgid "setup as shared repository"
msgstr "paylaşılan depo ayarla"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "yol belirteci"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "klon içerisindeki altmodülleri ilklendir"
@@ -11924,11 +12073,11 @@
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:111 builtin/init-db.c:533
msgid "template-directory"
msgstr "şablon dizini"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "şablonların kullanılacağı dizin"
@@ -11943,7 +12092,7 @@
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/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr "ad"
@@ -11959,8 +12108,8 @@
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:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "derinlik"
@@ -11968,7 +12117,8 @@
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:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr "zaman"
@@ -11976,12 +12126,12 @@
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:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
msgstr "revizyon"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir"
@@ -11998,11 +12148,11 @@
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:137 builtin/init-db.c:542
msgid "gitdir"
msgstr "git dizini"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "git dizinini çalışma ağacından ayır"
@@ -12014,23 +12164,23 @@
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:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
msgid "server-specific"
msgstr "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:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "iletme seçeneği"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
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:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr "yalnızca IPv6 adresleri kullan"
@@ -12062,32 +12212,32 @@
msgid "%s exists and is not a directory"
msgstr "%s var ve bir dizin değil"
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' bağı oluşturulamadı"
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "dosya şuraya kopyalanamadı: '%s'"
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "'%s' üzerinde yinelenemedi"
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "bitti.\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"
@@ -12097,137 +12247,137 @@
"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:589
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Klonlanacak %s uzak dal bulunamadı."
-#: builtin/clone.c:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "%s güncellenemiyor"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "sparse-checkout ilklendirilemedi"
-#: builtin/clone.c:776
+#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "çalışma ağacı çıkış yapılamıyor"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "parametreler yapılandırma dosyasına yazılamıyor"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "temizlik için yeniden paketlenemiyor"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
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:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr "Çok fazla değişken."
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr "Klonlamak için bir depo belirtmelisiniz."
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, 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:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, 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:1010 builtin/fetch.c:1789
#, 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:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1030
#, 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:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1050
#, 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:1070
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "'%s' çıplak deposuna klonlanıyor...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1072
#, 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:1096
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:1160
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:1162
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:1164
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:1166
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:1169
msgid "source repository is shallow, ignoring --local"
msgstr "kaynak depo sığ, --local yok sayılıyor"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr "--local yok sayıldı"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, 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:1260
msgid "You appear to have cloned an empty repository."
msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
@@ -12263,6 +12413,100 @@
msgid "--command must be the first argument"
msgstr "--command ilk değişken olmalı"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+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:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <nsndzn>] [--append] [--"
+"split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <bölme seçenekleri>"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr "dizin"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "Grafiğin depolanacağı nesne dizini"
+
+#: builtin/commit-graph.c:79
+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:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "commit-graph '%s' açılamadı"
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "tanımlanamayan --split değişkeni, %s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "tüm başvurularda gezinmeyi başlat"
+
+#: builtin/commit-graph.c:157
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "stdin tarafından listelenen paket indekslerini tara"
+
+#: builtin/commit-graph.c:159
+msgid "start walk at commits listed by stdin"
+msgstr "stdin tarafından listelenen tüm gönderilerde gezinmeyi başlat"
+
+#: builtin/commit-graph.c:161
+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:163
+msgid "enable computation for changed paths"
+msgstr "değiştirilen yollar için hesaplamayı etkinleştir"
+
+#: builtin/commit-graph.c:166
+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:170
+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:172
+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:174
+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:190
+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:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "beklenmedik onaltılık olmayan nesne kimliği: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12276,7 +12520,7 @@
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:547
#, c-format
msgid "not a valid object name %s"
msgstr "%s geçerli bir nesne adı değil"
@@ -12304,13 +12548,13 @@
msgid "id of a parent commit object"
msgstr "bir üst gönderi ögesinin no'su"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
msgstr "ileti"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
msgid "commit message"
msgstr "gönderi iletisi"
@@ -12318,8 +12562,8 @@
msgid "read commit log message from file"
msgstr "gönderi günlük iletisini dosyadan oku"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "gönderiyi GPG ile imzala"
@@ -12364,10 +12608,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"
@@ -12389,69 +12637,73 @@
"\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."
-#: 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."
-#: 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 gönderi 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"
-#: 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ş"
-#: 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"
@@ -12459,38 +12711,38 @@
"mevcut gönderi 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:1099
#, c-format
msgid "could not lookup commit %s"
msgstr "%s gönderisi aranamadı"
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
-#: builtin/commit.c:732
+#: 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ı"
-#: builtin/commit.c:853
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12505,7 +12757,7 @@
"\t%s\n"
"ve yeniden deneyin.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12520,7 +12772,7 @@
"\t%s\n"
"ve yeniden deneyin.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12529,7 +12781,7 @@
"Lütfen değişiklikleriniz için bir gönderi iletisi girin. '%c' ile başlayan\n"
"satırlar yok sayılacaktır. Boş bir ileti gönderiyi iptal eder.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12540,145 +12792,150 @@
"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
"Boş bir ileti gönderiyi iptal eder.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sYazar: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%sTarih: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sGönderen: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "İndeks okunamıyor"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "Ağaçlar yapılırken hata"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla "
"eşleşmiyor"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Geçersiz yok sayılanları göster kipi '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "--long ve -z birbiriyle uyumsuz"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "Değiştirecek bir şeyiniz yok."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
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:1189
+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:1192
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:1202
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:1204
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:1213
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:1231
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:1237
#, 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:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr "durumu kısaca göster"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr "dal bilgisini göster"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "zula bilgisini göster"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr "tam önünde/arkasında değerlerini hesapla"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
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:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "makine tarafından okunabilir çıktı"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
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:1382 builtin/commit.c:1540
msgid "terminate entries with NUL"
msgstr "girdileri NUL ile sonlandır"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "kip"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
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:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12686,11 +12943,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:1391 parse-options.h:192
msgid "when"
msgstr "ne zaman"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12698,177 +12955,177 @@
"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:1394
msgid "list untracked files in columns"
msgstr "izlenmeyen dosyaları sütunlarla göster"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "yeniden adlandırmaları algılama"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
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:1417
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Yok sayılan ve izlenmeyen dosyalar değişkenlerinin desteklenmeyen birlikte "
"kullanımı"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1499
msgid "suppress summary after successful commit"
msgstr "başarılı gönderinin ardından özeti gizle"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
msgid "show diff in commit message template"
msgstr "diff'i gönderi iletisi şablonunda göster"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "Commit message options"
msgstr "Gönderi iletisi seçenekleri"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "iletiyi dosyadan oku"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr "yazar"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr "gönderi yazarını geçersiz kıl"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr "tarih"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
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
+#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "gönderi"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
msgid "reuse and edit message from specified commit"
msgstr "belirtilen gönderinin iletisini düzenle ve yeniden kullan"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1508
msgid "reuse message from specified commit"
msgstr "belirtilen gönderinin iletisini yeniden kullan"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
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:1510
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"belirtilen gönderiyi tıkıştırmak için kendiliğinden tıkıştırma tarafından "
"biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1511
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"gönderinin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "Signed-off-by: ekle"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1513
msgid "use specified template file"
msgstr "belirtilen şablon dosyasını kullan"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr "gönderiyi zorla düzenle"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "include status in commit message template"
msgstr "gönderi iletisi şablonunda durumu içer"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "Commit contents options"
msgstr "Gönderi içeriği seçenekleri"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr "değiştirilen tüm dosyaları gönder"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
msgid "add specified files to index for commit"
msgstr "belirtilen dosyaları gönderi için indekse ekle"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1524
msgid "interactively add files"
msgstr "dosyaları etkileşimli olarak ekle"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr "değişiklikleri etkileşimli olarak ekle"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr "yalnızca belirtilen dosyaları gönder"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
msgid "bypass pre-commit and commit-msg hooks"
msgstr "pre-commit ve commit-msg kancalarını atla"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1528
msgid "show what would be committed"
msgstr "neyin gönderileceğini göster"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr "önceki gönderiyi değiştir"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr "post-rewrite kancasını atla"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr "boş bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
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:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE okunamadı"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1652
#, c-format
msgid "could not read commit message: %s"
msgstr "gönderi iletisi okunamadı: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1659
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Gönderi iletisinin boş olması nedeniyle gönderi iptal ediliyor.\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1664
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Gönderi iptal ediliyor; iletiyi düzenlemediniz.\n"
-#: builtin/commit.c:1691
+#: builtin/commit.c:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -12878,80 +13135,6 @@
"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>]"
@@ -13280,50 +13463,45 @@
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ıştan '%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 +13510,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 +13519,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"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13355,90 +13533,90 @@
"%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"
-#: 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"
-#: 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"
-#: 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"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken, gönderimsilerle uyumsuz"
@@ -13671,7 +13849,7 @@
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:1177 builtin/log.c:1724
msgid "refspec"
msgstr "başvuru belirteci"
@@ -13699,105 +13877,106 @@
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/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:117
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel negatif olamaz"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:140 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:142 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:144 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:146 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:147
msgid "force overwrite of local reference"
msgstr "yerel başvurunun üzerine zorla yaz"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
msgid "fetch from multiple remotes"
msgstr "birden çok uzak konumdan getir"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:151 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:153
msgid "do not fetch all tags (--no-tags)"
msgstr "tüm etiketleri getirme (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
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:157 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:159
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:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr "istek üzerine"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "control recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesini denetle"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "indirilen paketi tut"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
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:170 builtin/fetch.c:176 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:172 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:178 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:181
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:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13805,94 +13984,94 @@
"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:188 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:189 builtin/pull.c:226
msgid "refmap"
msgstr "ilgili başvuru"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "getirme ile ilgili başvuruları belirt"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:197 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
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr "getirme sonrasında 'gc --auto' çalıştır"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 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:204
msgid "write the commit-graph after fetching"
msgstr "getirdikten sonra gönderi grafiğini yaz"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr "Uzak HEAD başvurusu bulunamadı"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, 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:752
#, c-format
msgid "object %s not found"
msgstr "%s nesnesi bulunamadı"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr "[güncel]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr "[reddedildi]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr "geçerli dalda getirme yapılamıyor"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
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:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr "yerel başvuru güncellenemiyor"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr "var olan etiketi değiştirecektir"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr "[yeni etiket]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr "[yeni dal]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr "[yeni başvuru]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr "zorlanmış güncelleme"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr "ileri sarım değil"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13902,7 +14081,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:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13914,22 +14093,22 @@
"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
"bu denetlemeden kaçınabilirsiniz.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:914
#, 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:935
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s reddedilmeli, çünkü sığ köklerin güncellenmesine izin verilmiyor"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
-msgstr "Şuradan: %.*s\n"
+msgstr "Şu konumdan: %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13938,56 +14117,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:1128
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sarkacak)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s sarkmaya başladı)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr "[silindi]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr "(yok)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, 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:1204
#, 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:1207
#, 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:1415
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:1430
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:1432
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:1434
msgid "unknown branch type"
msgstr "bilinmeyen dal türü"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13995,22 +14174,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:1562 builtin/fetch.c:1625
#, 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:1572 builtin/fetch.c:1627 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "%s getirilemedi"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1584
#, 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:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14018,45 +14197,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:1724
msgid "You need to specify a tag name."
msgstr "Bir etiket adı belirtmeniz gerekiyor."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen için negatif derinlik desteklenmiyor"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen ve --depth birlikte kullanılamaz"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth ve --unshallow birlikte kullanılamaz"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
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:1798
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all bir depo değişkeni almıyor"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1800
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:1809
#, 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:1816
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:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14064,29 +14243,29 @@
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
"ile kullanılabilir."
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <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ışı)"
-#: 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"
@@ -14126,7 +14305,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:440
msgid "respect format colors"
msgstr "biçim renklerine uy"
@@ -14371,7 +14550,7 @@
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:786 builtin/prune.c:134
msgid "show progress"
msgstr "ilerlemeyi göster"
@@ -14407,12 +14586,12 @@
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:475 builtin/init-db.c:57
#, 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:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "'%s' okunamıyor"
@@ -14509,259 +14688,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:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, 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:475 builtin/grep.c:600 builtin/grep.c:640
#, c-format
msgid "unable to read tree (%s)"
msgstr "ağaç okunamıyor (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "%s türündeki bir nesneden grep yapılamıyor"
-#: builtin/grep.c:704
+#: builtin/grep.c:724
#, 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:823
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:825
msgid "find in contents not managed by git"
msgstr "git tarafından yönetilmeyen içerikte bul"
-#: builtin/grep.c:807
+#: builtin/grep.c:827
msgid "search in both tracked and untracked files"
msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
-#: builtin/grep.c:809
+#: builtin/grep.c:829
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'da belirtilen dosyaları yok say"
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "her altmodülde özyineli olarak ara"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "eşleşmeyen satırları göster"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
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:840
msgid "process binary files as text"
msgstr "ikili dosyaları metin olarak işle"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr "ikili dosyalardaki dizgileri eşleştirme"
-#: builtin/grep.c:825
+#: builtin/grep.c:845
msgid "process binary files with textconv filters"
msgstr "ikili dosyaları textconv süzgeçleri ile işle"
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr "altdizinlerde ara (öntanımlı)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "en çok <derinlik> düzeyine in"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr "dizgileri sabit diziler olarak yorumla"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "Perl uyumlu düzenli ifadeler kullan"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "satır numaralarını göster"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
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:867
msgid "don't show filenames"
msgstr "dosya adlarını gösterme"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "dosya adlarını göster"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
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:872
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:874
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches eşanlamlısı"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
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:879
msgid "print NUL after filenames"
msgstr "dosya adlarından sonra NUL yazdır"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
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:884
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:885
msgid "highlight matches"
msgstr "eşleşmeleri vurgula"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
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:889
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:892
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:895
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:897
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:899
msgid "use <n> worker threads"
msgstr "<n> iş parçacığı kullan"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "-C NUM için kısayol"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
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:905
msgid "show the surrounding function"
msgstr "çevresindeki işlevi göster"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "dizgileri dosyadan oku"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "<dizgi> ile eşleş"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "-e ile belirtilen dizgileri birleştir"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
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:926
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
+#: builtin/grep.c:928
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:932
msgid "pager"
msgstr "sayfalayıcı"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "sayfalayıcıda eşleşen dosyaları göster"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
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:1003
msgid "no pattern given"
msgstr "bir dizgi verilmedi"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
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:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "revizyon çözülemiyor: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
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:1084 builtin/pack-objects.c:3548
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:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, 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:1121
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:1147
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:1153
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:1161
msgid "both --cached and trees are given"
msgstr "hem --cached hem ağaçlar verilmiş"
@@ -14804,66 +14983,66 @@
msgid "process file as it were from this path"
msgstr "dosyayı sanki bu yoldanmış gibi işle"
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "print all available commands"
msgstr "tüm kullanılabilir komutlar yazdır"
-#: builtin/help.c:47
+#: 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 +15051,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,35 +15060,35 @@
"'%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:337
#, 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:367
#, 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'"
@@ -14947,7 +15126,7 @@
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:288 builtin/pack-objects.c:607
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"
@@ -14955,6 +15134,11 @@
msgid "pack exceeds maximum allowed size"
msgstr "paket izin verilen en büyük boyutu aşıyor"
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s' oluşturulamıyor"
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -15013,8 +15197,8 @@
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:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr "%s okunamıyor"
@@ -15075,7 +15259,7 @@
msgid "Resolving deltas"
msgstr "Deltalar çözülüyor"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr "iş parçacığı oluşturulamadı: %s"
@@ -15108,169 +15292,178 @@
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:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "yerel nesne %s hasarlı"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paket dosyası adı '%s', '.pack' ile bitmiyor"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1430
#, c-format
msgid "cannot write %s file '%s'"
msgstr "%s dosyası '%s' yazılamıyor"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1438
#, 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:1462
msgid "error while closing pack file"
msgstr "paket dosyası kapatılırken hata"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "paket dosyası depolanamıyor"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr "indeks dosyası depolanamıyor"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "hatalı pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, 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:1598
#, 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:1646
#, 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:1653
#, 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:1692
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:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "hatalı %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1782
msgid "--stdin requires a git repository"
msgstr "--stdin bir git dizini gerektirir"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
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:1836 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:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "'%s' şablonunun bilgileri alınamıyor"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "'%s' opendir yapılamıyor"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "'%s' readlink yapılamıyor"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, 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:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "'%s' şuraya kopyalanamıyor: '%s'"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "%s şablonu yok sayılıyor"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "şablonlar %s içinde bulunamadı"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, 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:356
#, c-format
msgid "unable to handle file type %d"
msgstr "%d dosya türü işlenemiyor"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
#, 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:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor"
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "bilinmeyen sağlama algoritması '%s'"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s halihazırda var"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, 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:459
#, 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:463
#, 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:464
#, 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:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15278,25 +15471,33 @@
"git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--"
"shared[=<izinler>]] [<dizin>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "izinler"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:544
+msgid "hash"
+msgstr "sağlama"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "kullanılacak sağlama algoritmasını belirle"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr "%s mkdir yapılamıyor"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr "%s ögesine chdir yapılamıyor"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15305,7 +15506,7 @@
"%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden "
"izin verilmiyor"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "'%s' çalışma ağacına erişilemiyor"
@@ -15374,126 +15575,126 @@
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:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [<seçenekler>] <nesne>..."
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "geçersiz --decorate seçeneği: %s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "kaynağı göster"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr "posta eşlem dosyasını kullan"
-#: builtin/log.c:177
+#: builtin/log.c:182
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:184
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:185
msgid "decorate options"
msgstr "süsleme seçenekleri"
-#: builtin/log.c:183
+#: builtin/log.c:188
msgid "Process line range n,m in file, counting from 1"
msgstr "dosya içindeki n,m satır aralığını 1'den sayarak işle"
-#: builtin/log.c:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "Son çıktı: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, 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:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "%s nesnesi okunamadı"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "bilinmeyen tür: %d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, 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:842
msgid "format.headers without value"
msgstr "format.headers değere iye değil"
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr "çıktı dizininin adı pek uzun"
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr "%s yama dosyası okunamıyor"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "bir tam erim gerekiyor"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "bir erim değil"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "niyet mektubu için e-posta biçimi gerekli"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr "cover-letter dosyası oluşturulamadı"
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "akıl almaz in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1334
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:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, c-format
msgid "unknown commit %s"
msgstr "bilinmeyen gönderi %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15505,386 +15706,386 @@
"no>\n"
"kullanarak el ile belirtebilirsiniz."
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
msgid "base commit should be the ancestor of revision list"
msgstr "taban gönderisi revizyon listesinin atası olmalı"
-#: builtin/log.c:1478
+#: builtin/log.c:1499
msgid "base commit shouldn't be in revision list"
msgstr "taban gönderisi revizyon listesinde olmamalı"
-#: builtin/log.c:1531
+#: builtin/log.c:1552
msgid "cannot get patch id"
msgstr "yama numarası alınamıyor"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "range-diff erimlerinden bir anlam çıkarılamadı"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
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:1653
msgid "use [PATCH] even with multiple patches"
msgstr "birden çok yama bile olsa [PATCH] kullan"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "yamaları standart çıktıya yazdır"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "bir niyet mektubu oluştur"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
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:1662
msgid "sfx"
msgstr "sonek"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' yerine <sonek> kullan"
-#: builtin/log.c:1644
+#: builtin/log.c:1665
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:1667
msgid "mark the series as Nth re-roll"
msgstr "diziyi n. deneme olarak imle"
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[PATCH] yerine [RFC PATCH] kullan"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "açıklama kipinden kapak sayfası kipi"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr "niyet mektubunun bazı kısımlarını dalın açıklamasından oluştur"
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] yerine [<önek>] kullan"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "ortaya çıkan dosyaları <dizin>'de depola"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]'i soyma/ekleme"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "ikili diff'leri çıktı verme"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
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:1688
msgid "don't include a patch matching a commit upstream"
msgstr "üstkaynaktaki bir gönderi ile eşleşen bir yamayı içerme"
-#: builtin/log.c:1669
+#: builtin/log.c:1690
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:1692
msgid "Messaging"
msgstr "İletileşme"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "başlık"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "e-posta başlığı ekle"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr "e-posta"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "To: başlığı ekle"
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr "Cc: başlığı ekle"
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr "tanımlayıcı"
-#: builtin/log.c:1679
+#: builtin/log.c:1698
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"From adresini <tanımlayıcı> olarak ayarla (veya yoksa gönderici "
"tanımlayıcısı)"
-#: builtin/log.c:1681
+#: builtin/log.c:1700
msgid "message-id"
msgstr "ileti no"
-#: builtin/log.c:1682
+#: builtin/log.c:1701
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:1702 builtin/log.c:1705
msgid "boundary"
msgstr "sınır"
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr "yamayı ekle"
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr "yamayı iletiye koy"
-#: builtin/log.c:1691
+#: builtin/log.c:1710
msgid "enable message threading, styles: shallow, deep"
msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
-#: builtin/log.c:1693
+#: builtin/log.c:1712
msgid "signature"
msgstr "imza"
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr "imza ekle"
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr "taban gönderi"
-#: builtin/log.c:1696
+#: builtin/log.c:1715
msgid "add prerequisite tree info to the patch series"
msgstr "yama dizisine önkoşulan ağaç bilgisini ekle"
-#: builtin/log.c:1698
+#: builtin/log.c:1717
msgid "add a signature from a file"
msgstr "dosyadan bir imza ekle"
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr "yama dosya adlarını yazdırma"
-#: builtin/log.c:1701
+#: builtin/log.c:1720
msgid "show progress while generating patches"
msgstr "yamalar oluşturulurken ilerlemeyi göster"
-#: builtin/log.c:1703
+#: builtin/log.c:1722
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"<rev> karşısındaki değişiklikleri niyet mektubunda veya tek bir yamada göster"
-#: builtin/log.c:1706
+#: builtin/log.c:1725
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"<bşvr-blrtç> karşısındaki değişiklikleri niyet mektubunda veya tek bir "
"yamada göster"
-#: builtin/log.c:1708
+#: builtin/log.c:1727
msgid "percentage by which creation is weighted"
msgstr "oluşumun tartıldığı yüzde"
-#: builtin/log.c:1792
+#: builtin/log.c:1812
#, c-format
msgid "invalid ident line: %s"
msgstr "geçersiz tanımlayıcı satırı: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr "-n ve -k birlikte kullanılamaz"
-#: builtin/log.c:1809
+#: builtin/log.c:1829
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:1837
msgid "--name-only does not make sense"
msgstr "--name-only bir anlam ifade etmiyor"
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr "--name-status bir anlam ifade etmiyor"
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr "--check bir anlam ifade etmiyor"
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr "standart çıktı veya dizin, hangisi?"
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff v%d karşısında:"
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor, --range-diff gerektiriyor"
-#: builtin/log.c:1973
+#: builtin/log.c:1993
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:2001
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff v%d karşısında:"
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' imza dosyası okunamıyor"
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr "Yamalar oluşturuluyor"
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr "çıktı dosyaları oluşturulamadı"
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, 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:471
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<seçenekler>] [<dosya>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr "dosya durumunu etiketlerle tanımla"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr "silinen dosyaları çıktıda göster"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr "değiştirilen dosyaları çıktıda göster"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr "diğer dosyaları çıktıda göster"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr "yok sayılan dosyaları çıktıda göster"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr "hazırlanan içeriğin nesne adını çıktıda göster"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr "'diğer' dizinlerin yalnızca adını göster"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr "dosyaların satır sonlarını göster"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr "boş dizinleri gösterme"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr "birleştirilmemiş dosyaları çıktıda göster"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr "'resolve-undo' bilgisini göster"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr "dizgi ile eşleşen dosyaları atla"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr "hariç tutma dizgileri <dosya>'dan okunuyor"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr "standart git hariç tutmalarını ekle"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr "çıktıyı en üst proje dizinine göreceli olarak yap"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr "altmodüller içinden özyinele"
-#: 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 "eğer bir <dosya> indekste değilse bunu bir hata olarak gör"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr "ağacımsı"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr "hata ayıklama verisini göster"
@@ -15902,7 +16103,7 @@
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:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
msgid "exec"
msgstr "çalıştır"
@@ -15975,391 +16176,6 @@
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>..."
@@ -16380,23 +16196,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <başvuru> [<gönderi>]"
-#: 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"
@@ -16471,6 +16287,391 @@
msgid "Merging %s with %s\n"
msgstr "%s, %s ile birleştiriliyor\n"
+#: builtin/merge.c:56
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<seçenekler>] [<gönderi>...]"
+
+#: 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:121
+msgid "switch `m' requires a value"
+msgstr "'m' anahtarı bir değer gerektiriyor"
+
+#: builtin/merge.c:144
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "'%s' seçeneği bir değer gerektiriyor"
+
+#: builtin/merge.c:190
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available strategies are:"
+msgstr "Kullanılabilir stratejiler:"
+
+#: builtin/merge.c:196
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Kullanılabilir özel stratejiler:"
+
+#: builtin/merge.c:247 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:250 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:251 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(--stat eşanlamlısı)"
+
+#: builtin/merge.c:253 builtin/pull.c:142
+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:256 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "bir birleştirme yerine tek bir gönderi oluştur"
+
+#: builtin/merge.c:258 builtin/pull.c:151
+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:260 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "göndermeden önce iletiyi düzenle"
+
+#: builtin/merge.c:262
+msgid "allow fast-forward (default)"
+msgstr "ileri sarıma izin ver (öntanımlı)"
+
+#: builtin/merge.c:264 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "ileri sarım olanaklı değilse iptal et"
+
+#: builtin/merge.c:268 builtin/pull.c:164
+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:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
+msgid "strategy"
+msgstr "strateji"
+
+#: builtin/merge.c:270 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "kullanılacak birleştirme stratejisi"
+
+#: builtin/merge.c:271 builtin/pull.c:172
+msgid "option=value"
+msgstr "seçenek=değer"
+
+#: builtin/merge.c:272 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "seçili birleştirme stratejisi için seçenekler"
+
+#: builtin/merge.c:274
+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:281
+msgid "abort the current in-progress merge"
+msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
+
+#: builtin/merge.c:283
+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:285
+msgid "continue the current in-progress merge"
+msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
+
+#: builtin/merge.c:287 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
+
+#: builtin/merge.c:294
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "pre-merge-commit ve commit-msg kancalarını atla"
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "zula alınamadı"
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "zula başarısız oldu"
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr "geçerli bir nesne değil: %s"
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr "read-tree başarısız oldu"
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr " (tıkıştırılacak bir şey yok)"
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Tıkıştırma gönderisi -- HEAD güncellenmiyor\n"
+
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
+
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' bir gönderiye işaret etmiyor"
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
+
+#: builtin/merge.c:716
+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:730
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive için geçersiz seçenek: -X%s"
+
+#: builtin/merge.c:745
+#, c-format
+msgid "unable to write %s"
+msgstr "%s yazılamıyor"
+
+#: builtin/merge.c:797
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Şu konumdan okunamadı: '%s'"
+
+#: builtin/merge.c:806
+#, 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:812
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\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:817
+msgid "An empty message aborts the commit.\n"
+msgstr "Boş bir ileti gönderiyi iptal eder.\n"
+
+#: builtin/merge.c:820
+#, 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:873
+msgid "Empty commit message."
+msgstr "Boş gönderi iletisi."
+
+#: builtin/merge.c:888
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Harika.\n"
+
+#: builtin/merge.c:949
+#, 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:988
+msgid "No current branch."
+msgstr "Geçerli dal yok."
+
+#: builtin/merge.c:990
+msgid "No remote for the current branch."
+msgstr "Geçerli dal için uzak konum yok."
+
+#: builtin/merge.c:992
+msgid "No default upstream defined for the current branch."
+msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
+
+#: builtin/merge.c:997
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "%s için %s konumundan uzak izleyen dal yok"
+
+#: builtin/merge.c:1054
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Hatalı değer '%s', '%s' ortamında"
+
+#: builtin/merge.c:1157
+#, 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:1191
+msgid "not something we can merge"
+msgstr "birleştirebileceğimiz bir şey değil"
+
+#: builtin/merge.c:1295
+msgid "--abort expects no arguments"
+msgstr "--abort bir değişken beklemez"
+
+#: builtin/merge.c:1299
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1317
+msgid "--quit expects no arguments"
+msgstr "--quit bir değişken beklemez"
+
+#: builtin/merge.c:1330
+msgid "--continue expects no arguments"
+msgstr "--continue bir değişken beklemez"
+
+#: builtin/merge.c:1334
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1350
+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:1357
+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:1360
+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:1374
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash ile --no-ff birlikte kullanılamaz."
+
+#: builtin/merge.c:1376
+msgid "You cannot combine --squash with --commit."
+msgstr "--squash ile --commit birlikte kullanılamaz."
+
+#: builtin/merge.c:1392
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Belirtilen bir gönderi yok ve merge.defaultToUpstream ayarlanmamış."
+
+#: builtin/merge.c:1409
+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:1411
+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:1416
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - birleştirebileceğimiz bir şey değil"
+
+#: builtin/merge.c:1418
+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:1499
+msgid "refusing to merge unrelated histories"
+msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
+
+#: builtin/merge.c:1508
+msgid "Already up to date."
+msgstr "Tümü güncel."
+
+#: builtin/merge.c:1518
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Güncelleniyor: %s..%s\n"
+
+#: builtin/merge.c:1564
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
+
+#: builtin/merge.c:1571
+#, c-format
+msgid "Nope.\n"
+msgstr "Yok.\n"
+
+#: builtin/merge.c:1596
+msgid "Already up to date. Yeeah!"
+msgstr "Her şey güncel. İşte bu!"
+
+#: builtin/merge.c:1602
+msgid "Not possible to fast-forward, aborting."
+msgstr "İleri sarma olanaklı değil, iptal ediliyor."
+
+#: builtin/merge.c:1630 builtin/merge.c:1695
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
+
+#: builtin/merge.c:1634
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "%s birleştirme stratejisi deneniyor...\n"
+
+#: builtin/merge.c:1686
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
+
+#: builtin/merge.c:1688
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
+
+#: builtin/merge.c:1697
+#, 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:1711
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16507,7 +16708,7 @@
"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/prune-packed.c:25
msgid "too many arguments"
msgstr "çok fazla değişken"
@@ -16609,7 +16810,7 @@
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:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s' yeniden adlandırılamadı"
@@ -16799,7 +17000,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:533
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s' açılamadı veya okunamadı"
@@ -17031,7 +17232,7 @@
"çözün ve sonucu 'git notes merge --commit' ile gönderin. Birleştirmeyi iptal "
"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n"
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
@@ -17049,7 +17250,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:164
msgid "do not remove, show only"
msgstr "kaldırma, yalnızca göster"
@@ -17065,121 +17266,121 @@
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:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "bilinmeyen altkomut: %s"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<seçenekler>...] [< <bşvr-liste> | < <nesne-"
"liste>]"
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, 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:442
#, 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:573
#, 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:784
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u nesne sipariş verildi, %<PRIu32> bekleniyordu"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:973
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:986
msgid "Writing objects"
msgstr "Nesneler yazılıyor"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 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:1100
#, 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:1298
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:1725
#, 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:1734
#, 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:2005
msgid "Counting objects"
msgstr "Nesneler sayılıyor"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, 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:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, 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:2223 builtin/pack-objects.c:2250
#, 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:2260
msgid "suboptimal pack - out of memory"
msgstr "standart altı paket - bellek yetersiz"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, 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:2714
#, 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:2802
msgid "Compressing objects"
msgstr "Nesneler sıkıştırılıyor"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr "delta sayımında tutarsızlık"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17188,7 +17389,7 @@
"sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17197,227 +17398,227 @@
"nesne numarası bekleniyordu, anlamsız veri alındı:\n"
"%s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
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:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr "paket indeksi açılamıyor"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, 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:3168
msgid "unable to force loose object"
msgstr "gevşek nesne zorlanamıyor"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr "bir revizyon değil: '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr "hatalı revizyon: '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr "en son nesneler eklenemiyor"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr "desteklenmeyen indeks sürümü %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr "hatalı indeks sürümü '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr "<sürüm>[,<ofset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
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:3388
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:3390
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:3392
msgid "ignore packed objects"
msgstr "paketlenmiş nesneleri yok say"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
msgid "limit pack window by objects"
msgstr "paket penceresini nesnelerle sınırla"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3396
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:3398
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:3400
msgid "reuse existing deltas"
msgstr "var olan deltaları yeniden kullan"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr "var olan nesneleri yeniden kullan"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA nesneleri kullan"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
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:3408
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:3410
msgid "read revision arguments from standard input"
msgstr "revizyon değişkenlerini standart girdi'den oku"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3412
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:3415
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:3418
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:3421
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:3424
msgid "output pack to stdout"
msgstr "paketi stdout'a çıktı ver"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
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:3428
msgid "keep unreachable objects"
msgstr "ulaşılamayan nesneleri tut"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr "ulaşılamayan gevşek nesneleri paketle"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
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:3435
msgid "use the sparse reachability algorithm"
msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr "ince paketler oluştur"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
msgid "create packs suitable for shallow fetches"
msgstr "sığ getirmelere uygun paketler oluştur"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3441
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:3443
msgid "ignore this pack"
msgstr "bu paketi yok say"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr "paket sıkıştırma düzeyi"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr "aşılarla gelen gönderileri gizleme"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
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:3451
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:3455
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:3459
msgid "handling for missing objects"
msgstr "eksik nesneler için işlem"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
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:3464
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:3493
#, 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:3498
#, 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:3552
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:3554
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:3559
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:3562
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:3568
msgid "cannot use --filter without --stdout"
msgstr "--filter, --stdout olmadan kullanılamaz"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
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:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17438,32 +17639,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,45 +17673,72 @@
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:478 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:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"Iraksak dalların nasıl uzlaştırılacağı belirtilmeden çekme yapmak önerilmez.\n"
+"Bu iletiyi bir sonraki çekmenizden önce aşağıdaki komutlardan birini\n"
+"ç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:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17522,12 +17746,12 @@
"Az önce getirdiğiniz referanslar arasında yeniden temellendirme için aday "
"yok."
-#: builtin/pull.c:428
+#: builtin/pull.c:461
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:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17535,7 +17759,7 @@
"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:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17546,44 +17770,44 @@
"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:470 builtin/rebase.c:1234 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Şu anda bir dal üzerinde değilsiniz."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Lütfen hangi dala karşı yeniden temellendirme yapmak istediğinizi belirtin."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Lütfen hangi dal ile birleştirmek istediğinizi belirtin."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
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:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<uzak-konum>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<dal>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Geçerli dal için izleme bilgisi yok."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Eğer bu dal için izleme bilgisi ayarlamak isterseniz şununla yapabilirsiniz:"
-#: builtin/pull.c:466
+#: builtin/pull.c:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17592,32 +17816,28 @@
"Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi söylüyor,\n"
"ancak böyle bir başvuru getirilmedi."
-#: builtin/pull.c:576
+#: builtin/pull.c:610
#, c-format
msgid "unable to access commit %s"
msgstr "%s gönderisine erişilemedi"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
msgid "ignoring --verify-signatures for rebase"
msgstr "yeniden temellendirme için --verify-signature yok sayılıyor"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash seçeneği yalnızca --rebase ile geçerli."
-
-#: builtin/pull.c:920
+#: builtin/pull.c:955
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:959
msgid "pull with rebase"
msgstr "yeniden temellendirme ile çek"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "Lütfen onları gönderin veya zulalayın."
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17628,7 +17848,7 @@
"Çalışma ağacınız %s gönderisinden\n"
"ileri sarılıyor."
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17645,15 +17865,15 @@
"$ git reset --hard\n"
"komutunu çalıştırın."
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
msgid "Cannot merge multiple branches into empty head."
msgstr "Boş dal ucuna birden çok dal birleştirilemez."
-#: builtin/pull.c:975
+#: builtin/pull.c:1010
msgid "Cannot rebase onto multiple branches."
msgstr "Birden çok dala yeniden temellendirme yapılamaz."
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
@@ -17787,7 +18007,7 @@
"(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"
@@ -17807,12 +18027,12 @@
"veya --force seçeneğini kullanmadan bir uzak başvuruyu gönderi\n"
"olmayan bir nesneye işaret etmesini sağlaması için güncelleyemezsiniz.\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
-msgstr "Şuraya itiliyor: %s\n"
+msgstr "İtme konumu: %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "bazı başvurular '%s' konumuna itilemedi"
@@ -17841,65 +18061,65 @@
msgid "force updates"
msgstr "zorla güncelle"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr "<başvuruadı>:<bekle>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "başvurunun eski değerinin bu değerde olmasını gerektir"
-#: builtin/push.c:556
+#: builtin/push.c:555
msgid "control recursive pushing of submodules"
msgstr "altmodüllerin özyineli itilmesini denetle"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "ince paket kullan"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "paket programını al"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "set upstream for git pull/status"
msgstr "git pull/status için üstkaynak ayarla"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "prune locally removed refs"
msgstr "yerelde kaldırılan başvuruları buda"
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr "pre-push kancasını atla"
-#: builtin/push.c:567
+#: builtin/push.c:565
msgid "push missing but relevant tags"
msgstr "eksik ancak ilgili etiketleri it"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "itmeyi GPG ile imzala"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "uzak tarafta atomsal işlem iste"
-#: builtin/push.c:590
+#: builtin/push.c:587
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
-#: builtin/push.c:592
+#: builtin/push.c:589
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:609
#, c-format
msgid "bad repository '%s'"
msgstr "hatalı depo '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17921,27 +18141,27 @@
"\n"
"\tgit push <ad>\n"
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr "--all ve --tags birbiriyle uyumsuz"
-#: builtin/push.c:630
+#: builtin/push.c:627
msgid "--all can't be combined with refspecs"
msgstr "--all başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:634
+#: builtin/push.c:631
msgid "--mirror and --tags are incompatible"
msgstr "--mirror ve --tags birbiriyle uyumsuz"
-#: builtin/push.c:636
+#: builtin/push.c:633
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:639
+#: builtin/push.c:636
msgid "--all and --mirror are incompatible"
msgstr "--all ve --mirror birbiriyle uyumsuz"
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
@@ -18069,7 +18289,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 +18297,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:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "kullanılamaz yapılacaklar listesi: '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "geçici %s oluşturulamadı"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "etkileşimli olarak imlenemedi"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "yapılacaklar listesi oluşturulamadı"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
msgid "a base commit must be provided with --upstream or --onto"
msgstr "bir taban gönderisi --upstream veya --onto ile sağlanmalıdır"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:468
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:481 builtin/rebase.c:1374
+msgid "keep commits which start empty"
+msgstr "boş başlayan gönderileri tut"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "boş iletili gönderilere izin ver"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr "birleştirme gönderilerini yeniden temellendir"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr "kuzenlerin orijinal dal noktalarını tut"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr "squash!/fixup! ile başlayan gönderileri taşı"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr "gönderileri imzala"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
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:496
msgid "continue rebase"
msgstr "yeniden temellendirmeyi sürdür"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "gönderiyi atla"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "yapılacaklar listesini düzenle"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "geçerli yamayı göster"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr "yapılacaklar listesindeki gönderi numaralarını kısalt"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr "yapılacaklar listesindeki gönderi numaralarını genişlet"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr "yapılacaklar listesini denetle"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr "fixup/squash satırlarını yeniden düzenle"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "yapılacaklar listesine 'exec' komutları ekle"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "üzerine"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "revizyonu sınırla"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "tıkıştır"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "üstkaynak gönderisi"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "dal ucu adı"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "yeniden temellendirme stratejisi"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "strateji seçenekleri"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "switch-to"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
msgstr "çıkış yapılacak dal veya gönderi"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "'onto' adı:"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "komut"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "çalıştırılacak komut"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
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:553
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:569
#, 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
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "'onto' alınamadı: '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "geçersiz orig-head: '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, 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:799 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18303,7 +18509,7 @@
"İ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:882
#, c-format
msgid ""
"\n"
@@ -18322,7 +18528,7 @@
"\n"
"Bunun sonucu olarak git onları yeniden temellendiremiyor."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18330,7 +18536,7 @@
msgstr ""
"tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\""
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -18347,7 +18553,7 @@
"\tgit rebase '<dal>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18360,141 +18566,141 @@
"\tgit branch --set-upstream-to=%s/<dal> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
msgid "exec commands cannot contain newlines"
msgstr "'exec' komutları yenisatırlar içeremez"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1276
msgid "empty exec command"
msgstr "boş 'exec' komutu"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
msgid "rebase onto given branch instead of upstream"
msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1307
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:1309
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:1311
msgid "be quiet. implies --no-stat"
msgstr "sessiz ol (--no-stat ima eder)"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
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
+#: builtin/rebase.c:1320
msgid "add a Signed-off-by: line to each commit"
msgstr "her gönderiye bir Signed-off-by satırı ekle"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr "'git am'a aktarıldı"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr "'git apply'a aktarıldı"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
msgid "cherry-pick all commits, even if unchanged"
msgstr "değiştirilmemiş olsa bile tüm gönderileri seç-al yap"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1339
msgid "continue"
msgstr "sürdür"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr "geçerli yamayı atla ve sürdür"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
msgstr "iptal et ve orijinal dalı çıkış yap"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
msgid "abort but keep HEAD where it is"
msgstr "iptal et, ancak HEAD'i olduğu yerde bırak"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1348
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:1351
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:1354
msgid "use apply strategies to rebase"
msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
msgid "let the user edit the list of commits to rebase"
msgstr ""
"yeniden temellendirilecek gönderilerin listesini kullanıcının düzenlemesine "
"izin ver"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1366
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(KULLANIM DIŞI) birleştirmeleri yok saymak yerine onları yeniden oluşturmaya "
"çalış"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1371
msgid "how to handle commits that become empty"
msgstr "boşalan gönderiler nasıl işlensin"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "-i altındaki squash!/fixup! ile başlayan gönderileri taşı"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1385
msgid "add exec lines after each commit of the editable list"
msgstr "düzenlenebilir listenin her gönderisinden sonra exec satırları ekle"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1389
msgid "allow rebasing commits with empty messages"
msgstr "boş iletili gönderilerin yeniden temellendirilmesine izin ver"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
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:1396
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:1398
msgid "use the given merge strategy"
msgstr "verilen birleştirme stratejisini kullan"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
msgid "option"
msgstr "seçenek"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
msgid "pass the argument through to the merge strategy"
msgstr "değişkeni birleştirme stratejisine aktar"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1404
msgid "rebase all reachable commits up to the root(s)"
msgstr "ulaşılabilir tüm gönderileri kök(ler)e kadar yeniden temellendir"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1409
+msgid "apply all changes, even those already present upstream"
+msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile"
+
+#: builtin/rebase.c:1426
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18502,40 +18708,44 @@
"'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:1432
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:1473
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"'git rebase --preserve-merges' kullanım dışı. Yerine --rebase-merges "
"kullanın."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "--keep-base ile --onto birlikte kullanılamaz"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
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:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "--root ile --fork-point birlikte kullanılamaz"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1487
+msgid "No rebase in progress?"
+msgstr "Sürmekte olan bir yeniden temellendirme yok"
+
+#: builtin/rebase.c:1491
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:1514
msgid "Cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18543,16 +18753,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:1545
msgid "could not discard worktree changes"
msgstr "çalışma ağacı değişiklikleri atılamadı"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr "%s konumuna geri taşınamadı"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18573,166 +18783,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:1638
msgid "switch `C' expects a numerical value"
msgstr "'C' anahtarı sayısal bir değer bekliyor"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr "Bilinmeyen kip: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy, --merge veya --interactive gerektiriyor"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
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:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
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:1794
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:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr "geçersiz üstkaynak '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr "Yeni kök gönderi oluşturulamadı"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, 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:1853
#, 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:1861
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' geçerli bir gönderiye işaret etmiyor"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1887
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "onulmaz: böyle bir dal/gönderi yok: '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "Böyle bir başvuru yok: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
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:1927
msgid "Please commit or stash them."
msgstr "Lütfen onları gönderin veya zulalayın."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr "şuraya geçilemedi: %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr "HEAD güncel."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, 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:1984
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD güncel, yeniden temellendirme zorlandı."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Geçerli dal %s güncel, yeniden temellendirme zorlandı.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:1994
msgid "The pre-rebase hook refused to rebase."
msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2001
#, c-format
msgid "Changes to %s:\n"
msgstr "%s için olan değişiklikler:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "%s -> %s değişiklikleri:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, 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:2038
msgid "Could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, 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:843
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"
@@ -18761,7 +18948,7 @@
"denyCurrentBranch'\n"
"yapılandırma değişkenini 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:863
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"
@@ -18781,11 +18968,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:1960
msgid "quiet"
msgstr "sessiz"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr "Bir dizin belirtmelisiniz."
@@ -19368,11 +19555,11 @@
msgid "Will not delete all non-push URLs"
msgstr "Tüm itme olmayan URL'ler silinmeyecek"
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr "git repack [<seçenekler>]"
-#: 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."
@@ -19381,112 +19568,112 @@
"--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:193
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:232 builtin/repack.c:418
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:256
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:294
msgid "pack everything in a single pack"
msgstr "her şeyi tek bir pakete sığdır"
-#: builtin/repack.c:294
+#: builtin/repack.c:296
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:299
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:301
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:303
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:305
msgid "do not run git-update-server-info"
msgstr "'git-update-server-info' çalıştırma"
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "--local'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "biteşlem indeksi yaz"
-#: builtin/repack.c:310
+#: builtin/repack.c:312
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:311
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "yaklaşık tarih"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
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:316
msgid "with -a, repack unreachable objects"
msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
-#: builtin/repack.c:316
+#: builtin/repack.c:318
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:319 builtin/repack.c:325
msgid "bytes"
msgstr "baytlar"
-#: builtin/repack.c:318
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr "yukarıdakiyle aynı, ancak girdi sayısı yerine bellek boyutunu kısıtla"
-#: builtin/repack.c:320
+#: builtin/repack.c:322
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:324
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:326
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:328
msgid "repack objects in packs marked with .keep"
msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle"
-#: builtin/repack.c:328
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr "bu paketi yeniden paketleme"
-#: builtin/repack.c:338
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr "bir precious-objects deposundaki paketler silinemiyor"
-#: builtin/repack.c:342
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "Paketlenecek yeni bir şey yok."
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -19505,7 +19692,7 @@
"UYARI: girişimi de başarısız oldu.\n"
"UYARI: Lütfen bunları %s içinde el ile yeniden adlandırın:\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "'%s' kaldırılamadı"
@@ -19815,94 +20002,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/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "sessiz ol, yalnızca hataları bildir"
-#: builtin/reset.c: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"
-#: 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>' "
"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,16 +20098,16 @@
"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ı."
@@ -19940,23 +20127,23 @@
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>...]"
-#: 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"
-#: 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"
-#: 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"
@@ -20158,15 +20345,15 @@
msgid "remote name"
msgstr "uzak konum adı"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "durumsuz RPC protokolünü kullan"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "başvuruları stdin'den oku"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "uzak konum yardımcısından durum yazdır"
@@ -20386,70 +20573,58 @@
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
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:212
msgid "failed to create directory for sparse-checkout file"
msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
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:326
#, c-format
msgid "failed to open '%s'"
msgstr "'%s' açılamadı"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, 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:395
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:420
#, 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:474 builtin/sparse-checkout.c:498
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:543
msgid "read patterns from standard in"
msgstr "dizgileri stdin'den oku"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "aralıklı çıkış dizgileri ayarla"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "aralıklı çıkışı devre dışı bırak"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "çalışma dizini yenilenirken hata"
@@ -20529,7 +20704,7 @@
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,7 +20713,7 @@
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
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "parametreli git stash clear henüz kullanılabilir değil"
@@ -20568,7 +20743,7 @@
msgid "Merging %s with %s"
msgstr "%s, %s ile birleştiriliyor"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "İndeks zuladan çıkartılmamıştı."
@@ -20591,105 +20766,107 @@
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:633
msgid "The stash entry is kept in case you need it again."
msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "Dal adı belirtilmedi"
-#: 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 "%s, %s ile güncellenemiyor"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr "zula iletisi"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" bir <gönderi> değişkeni gerektirir"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1046
msgid "No changes selected"
msgstr "Değişiklik seçilmedi"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
msgid "You do not have the initial commit yet"
msgstr "Henüz ilk gönderiniz yok"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1173
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:1182
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:1193 builtin/stash.c:1202
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:1230
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:1279
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:1295
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:1310
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:1317
msgid "Cannot initialize stash"
msgstr "Zula ilklendirilemiyor"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "Geçerli durum kaydedilemiyor"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, 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:1427
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:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "indeksi tut"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "yama kipinde zula"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "sessiz kip"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "include untracked files in stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1473 builtin/stash.c:1538
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:1573
+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]"
@@ -21131,17 +21308,25 @@
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:2241 git-submodule.sh:176
#, 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:2257
+msgid "Suppress output for setting url of a submodule"
+msgstr "Bir altmodül url ayarlanması çıktısını gizle"
+
+#: builtin/submodule--helper.c:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s, --super-prefix desteklemiyor"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2329
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' geçerli bir submodule-helper altkomutu değil"
@@ -21166,11 +21351,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:486
msgid "reason"
msgstr "neden"
-#: 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 "güncelleme nedeni"
@@ -21263,135 +21448,135 @@
msgid "bad object type."
msgstr "hatalı nesne türü"
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "etiket iletisi yok mu?"
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Etiket iletisi %s içinde bırakıldı\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "etiket adlarını listele"
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "her etiket iletisinin <n> satırını listele"
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "etiketleri sil"
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "etiketleri doğrula"
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Etiket oluşturma seçenekleri"
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "açıklama eklenmiş etiket için bir ileti gerek"
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr "etiket iletisi"
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "etiket iletisini zorla düzenle"
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "açıklama eklenmiş ve GPG imzalı etiket"
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "etiketi imzalamak için başka bir anahtar kullanın"
-#: builtin/tag.c:420
+#: builtin/tag.c:421
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:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "bir başvuru günlüğü oluştur"
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Etiket listeleme seçenekleri"
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "etiket listesini sütunlarla göster"
-#: 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 "yalnızca gönderiyi içeren etiketleri yazdır"
-#: 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 "yalnızca gönderi içermeyen etiketleri yazdır"
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "yalnızca birleştirilen etiketleri yazdır"
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "yalnızca nesnenin etiketlerini yazdır"
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column ve -n birbiriyle uyumsuz"
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:512
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "yalnızca bir -F veya -m seçeneğine izin verilir"
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr "çok fazla parametre"
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' geçerli bir etiket adı değil."
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "'%s' etiketi halihazırda var"
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "'%s' etiketi güncellendi (%s idi)\n"
@@ -21668,19 +21853,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:487
msgid "delete the reference"
msgstr "başvuruyu sil"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr "stdin'de NUL ile sonlandırılan değişkenler var"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "güncellemeleri stdin'den oku"
@@ -21772,7 +21957,7 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <yol>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr "'%s' silinemedi"
@@ -21855,115 +22040,115 @@
msgid "could not create directory of '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:435 builtin/worktree.c:441
#, 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:437
#, 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:446
#, 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:452
#, 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:493
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:496
msgid "create a new branch"
msgstr "yeni bir dal oluştur"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "yeni bir dal oluştur veya sıfırla"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "yeni çalışma ağacını doldur"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "yeni çalışma ağacını kilitli tut"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
msgid "set up tracking mode (see git-branch(1))"
msgstr "izleme kipini ayarla (bkz: git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
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:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B ve --detach birlikte kullanılamaz"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
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:676
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:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, 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:690 builtin/worktree.c:723
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:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' halihazırda kilitli, nedeni: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' halihazırda kilitli"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' kilitli değil"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
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:774
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:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' bir ana çalışma ağacı"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "hedef adı şuradan anlaşılamadı: '%s'"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr "'%s' hedefi halihazırda var"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21972,7 +22157,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:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21980,38 +22165,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:821
#, 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:826
#, 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:874
#, 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:878
#, 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:883
#, 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:906
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:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22020,7 +22205,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:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22028,7 +22213,7 @@
"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:934
#, 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"
@@ -22049,17 +22234,122 @@
msgid "only useful for debugging"
msgstr "yalnızca hata ayıklama için yararlı"
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr "git sürümü:\n"
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() '%s' hatasını verip çıktı (%d)\n"
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr "derleyici bilgisi: "
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr "libc bilgisi: "
+
+#: bugreport.c:74
+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"
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>]"
+
+#: bugreport.c:91
+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"
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr "hata raporu dosyası için bir konum belirtin"
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr "dosya adı için bir strftime biçimli ek belirtin"
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "'%s' için öncü dizinler oluşturulamadı"
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr "Sistem Bilgisi"
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr "Etkin Kancalar"
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "'%s' hata raporu dosyası oluşturulamadı"
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Hata raporu '%s' dosyasına yazıldı.\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "'mark' komutu bekleniyordu, %s alındı"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "'to' komutu bekleniyordu, %s alındı"
-#: fast-import.c:3254
+#: fast-import.c:3317
+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"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
@@ -22098,7 +22388,7 @@
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"
@@ -22114,7 +22404,7 @@
" [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n"
" <komut> [<değişkenler>]"
-#: 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"
@@ -22126,47 +22416,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:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "--git-dir için dizin verilmedi\n"
-#: git.c:200
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "--namespace için ad alanı verilmedi\n"
-#: git.c:214
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "--work-tree için dizin verilmedi\n"
-#: git.c:228
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "--super-prefix için önek verilmedi\n"
-#: git.c:250
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c bir yapılandırma dizisi bekliyor\n"
-#: git.c:288
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr "-C için dizin verilmedi\n"
-#: git.c:314
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr "bilinmeyen seçenek: %s\n"
-#: git.c:360
+#: git.c:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "'%s' arması genişletirilirken: '%s'"
-#: git.c:369
+#: git.c:371
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22175,39 +22465,39 @@
"'%s' arması ortam değişkenlerini değiştirir.\n"
"Bunu yapmak için armada '!git' kullanabilirsiniz."
-#: git.c:376
+#: git.c:378
#, c-format
msgid "empty alias for %s"
msgstr "%s için boş arma"
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr "özyineli arma: %s"
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr "standart çıktı'da yazma hatası"
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr "standart çıktı'da bilinmeyen yazma hatası"
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr "standart çıktı'da kapatma başarısız"
-#: git.c:793
+#: git.c:792
#, 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:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "%s bir yerleşik olarak işlenemiyor"
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
@@ -22216,55 +22506,55 @@
"kullanım: %s\n"
"\n"
-#: git.c:876
+#: git.c:875
#, 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:887
#, 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:914
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:993
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:1139
#, 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:1146
#, 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:1150
#, 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:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22385,6 +22675,14 @@
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "derleyici bilgisi mevcut değil\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "libc bilgisi mevcut değil\n"
+
#: list-objects-filter-options.h:85
msgid "args"
msgstr "değişkenler"
@@ -22440,11 +22738,11 @@
msgstr ""
"eğer olanaklıysa indeksi yeniden kullanılmış çakışma çözümü ile güncelle"
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "HEAD şurada ayrıldı: "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "HEAD şundan ayrıldı: "
@@ -22485,620 +22783,624 @@
msgstr "Dallar oluştur, sil veya listele"
#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Hata raporu bildirimi için veri topla"
+
+#: command-list.h:60
msgid "Move objects and refs by archive"
msgstr "Nesneleri ve başvuruları arşive göre taşı"
-#: command-list.h: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
+#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Henüz üstkaynağa uygulanmayan gönderileri bul"
-#: command-list.h:68
+#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
msgstr "Mevcut bazı gönderilerin getirdiği değişiklikleri uygula"
-#: command-list.h:69
+#: 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
+#: command-list.h:76
msgid "Create a new commit object"
msgstr "Yeni bir gönderi nesnesi oluştur"
-#: command-list.h:76
+#: 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
+#: command-list.h:82
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
+#: 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:83
+#: 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
+#: command-list.h:87
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
+#: 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"
-#: 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
+#: command-list.h:97
msgid "Produce a merge commit message"
msgstr "Bir birleştirme gönderisi iletisi oluştur"
-#: command-list.h:97
+#: 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 "Prepare patches for e-mail submission"
msgstr "E-posta teslimi için yamaları hazırla"
-#: command-list.h:99
+#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Veritab. nesnelerin bağlanırlığını ve geçerliliğini sına"
-#: command-list.h:100
+#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Gereksiz dosyaları temizle ve yerel depoyu eniyile"
-#: command-list.h:101
+#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Gönderi iletisini bir git-archive arşivinden çıkartıp al"
-#: command-list.h:102
+#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "Bir dizgi ile eşleşen satırları yazdır"
-#: command-list.h:103
+#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "Git için taşınabilir bir grafik arabirim"
-#: command-list.h:104
+#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "Sağlamayı hesapla ve isteğe göre dosyadan ikili oluştur"
-#: command-list.h:105
+#: command-list.h:106
msgid "Display help information about Git"
msgstr "Git yardım bilgisini görüntüle"
-#: command-list.h:106
+#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "Git'in HTTP üzerinden sunucu tarafı uygulaması"
-#: command-list.h:107
+#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "HTTP üzerinden uzak bir Git deposundan indir"
-#: command-list.h:108
+#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Nesneleri HTTP/DAV üzerinden başka bir depoya it"
-#: command-list.h:109
+#: command-list.h:110
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "stdin'den bir IMAP klasörüne bir yama derlemesi gönder"
-#: command-list.h:110
+#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr "Mevcut paketli bir arşiv için paket indeks dosyası yap"
-#: command-list.h:111
+#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Boş bir Git deposu oluştur veya var olanı yeniden başlat"
-#: command-list.h:112
+#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "gitweb'deki çalışma deposuna anında göz at"
-#: command-list.h:113
+#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr "Gönderi iletilerine düzenli bilgi ekle veya ayrıştır"
-#: command-list.h:114
+#: command-list.h:115
msgid "The Git repository browser"
msgstr "Git depo tarayıcısı"
-#: command-list.h:115
+#: command-list.h:116
msgid "Show commit logs"
msgstr "Gönderi günlüklerini göster"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "İndeks ve çalışma ağacındaki dosya bilgilerini göster"
-#: command-list.h:117
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Uzak bir depodaki başvuruları listele"
-#: command-list.h:118
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Bir ağaç nesnesinin içeriğini listele"
-#: command-list.h:119
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart"
-#: command-list.h:120
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Yalın UNIX mbox bölücü yazılımı"
-#: command-list.h:121
+#: command-list.h:122
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:123
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:124
msgid "Run a three-way file merge"
msgstr "Bir üç yönlü dosya birleştirmesi çalıştır"
-#: command-list.h:124
+#: command-list.h:125
msgid "Run a merge for files needing merging"
msgstr "Birleştirilmesi gereken dosyaları birleştir"
-#: command-list.h:125
+#: command-list.h:126
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:127
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:128
msgid "Show three-way merge without touching index"
msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
-#: command-list.h:128
+#: command-list.h:129
msgid "Write and verify multi-pack-indexes"
msgstr "multi-pack-index doğrula ve yaz"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "Bir etiket nesnesi oluştur"
-#: command-list.h:130
+#: command-list.h:131
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:132
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:133
msgid "Find symbolic names for given revs"
msgstr "Verilen revizyonlar için sembolik adları bul"
-#: command-list.h:133
+#: command-list.h:134
msgid "Add or inspect object notes"
msgstr "Nesne notları ekle veya incele"
-#: command-list.h:134
+#: command-list.h:135
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:136
msgid "Create a packed archive of objects"
msgstr "Paketlenmiş bir nesne arşivi oluştur"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "Gereksiz paket dosyalarını bul"
-#: command-list.h:137
+#: command-list.h:138
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
+#: command-list.h:139
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:140
msgid "Compute unique ID for a patch"
msgstr "Bir yama için eşi olmayan numara hesapla"
-#: command-list.h:140
+#: command-list.h:141
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:142
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:143
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:144
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:145
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:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "İki gönderi erimini karşılaştır (bir dalın iki sürümü)"
-#: command-list.h:146
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Ağaç bilgisini indekse okur"
-#: command-list.h:147
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Gönderileri başka bir temel ucu üzerine uygula"
-#: command-list.h:148
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Depoya ne itildiyse al"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Başvuru günlüğü bilgisini yönet"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "İzlenen depolar setini yönet"
-#: command-list.h:151
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Bir depodaki paketlenmemiş nesneleri paketle"
-#: command-list.h:152
+#: command-list.h:153
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:154
msgid "Generates a summary of pending changes"
msgstr "Bekleyen değişikliklerin bir özetini çıkart"
-#: command-list.h:154
+#: command-list.h:155
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:156
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:157
msgid "Restore working tree files"
msgstr "Çalışma ağacı dosyalarını eski durumuna getir"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "Bazı var olan gönderileri geri al"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "Gönderi nesnelerini ters kronolojik sırada listele"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Parametreleri al ve üzerinde çalış"
-#: command-list.h:160
+#: command-list.h:161
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:162
msgid "Send a collection of patches as emails"
msgstr "Bir yama derlemesini e-posta olarak gönder"
-#: command-list.h:162
+#: command-list.h:163
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:164
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:165
msgid "Summarize 'git log' output"
msgstr "'git log' çıktısını özetle"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "Çeşitli türde nesneleri göster"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "Dalları ve onların gönderilerini göster"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "Paketlenmiş arşiv indeksini göster"
-#: command-list.h:168
+#: command-list.h:169
msgid "List references in a local repository"
msgstr "Yerel bir depodaki başvuruları listele"
-#: command-list.h:169
+#: command-list.h:170
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:171
msgid "Common Git shell script setup code"
msgstr "Ortak Git kabuk betiği kurulum kodu"
-#: command-list.h:171
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Aralıklı çıkışı ilklendir ve güncelle"
-#: command-list.h:172
+#: command-list.h:173
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:174
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:175
msgid "Show the working tree status"
msgstr "Çalışma ağacı durumunu göster"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Gereksiz boşlukları kaldır"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Altmodülleri ilklendir, güncelle veya incele"
-#: command-list.h:177
+#: command-list.h:178
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:179
msgid "Switch branches"
msgstr "Dal değiştir"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Sembolik başvuruları oku, düzenle ve sil"
-#: command-list.h:180
+#: command-list.h:181
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:182
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:183
msgid "Unpack objects from a packed archive"
msgstr "Paketlenmiş bir arşivden nesneleri çıkar"
-#: command-list.h:183
+#: command-list.h:184
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:185
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:186
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:187
msgid "Send archive back to git-archive"
msgstr "Arşivi git-archive'e geri gönder"
-#: command-list.h:187
+#: command-list.h:188
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:189
msgid "Show a Git logical variable"
msgstr "Bir mantıksal Git değişkeni göster"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Gönderilerin GPG imzasını denetle"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Paketlenmiş Git arşiv dosyalarını doğrula"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Etiketlerin GPG imzasını doğrula"
-#: command-list.h:192
+#: command-list.h:193
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:194
msgid "Show logs with difference each commit introduces"
msgstr "Günlükleri her gönderinin sunduğu değişikliklerle göster"
-#: command-list.h:194
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Birden çok çalışma ağacını yönet"
-#: command-list.h:195
+#: command-list.h:196
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:197
msgid "Defining attributes per path"
msgstr "Öznitelikleri yola göre tanımla"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git komut satırı arabirimi ve kuralları"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
-#: command-list.h:199
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "CVS kullanıcıları için Git"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "diff çıktısı için ince ayarlar"
-#: command-list.h:201
+#: command-list.h:202
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:203
msgid "A Git Glossary"
msgstr "Git Kavram Dizini"
-#: command-list.h:203
+#: command-list.h:204
msgid "Hooks used by Git"
msgstr "Git tarafından kullanılan kancalar"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifies intentionally untracked files to ignore"
msgstr "Özellikle yok sayılması istenen dosyaları belirt"
-#: command-list.h:205
+#: command-list.h:206
msgid "Defining submodule properties"
msgstr "Altmodül özelliklerini tanımlama"
-#: command-list.h:206
+#: command-list.h:207
msgid "Git namespaces"
msgstr "Git ad alanları"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git Repository Layout"
msgstr "Git Depo Yerleşimi"
-#: command-list.h:208
+#: command-list.h:209
msgid "Specifying revisions and ranges for Git"
msgstr "Git için revizyonları ve erimleri belirtme"
-#: command-list.h:209
+#: command-list.h:210
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:211
msgid "A tutorial introduction to Git: part two"
msgstr "Git'e Giriş: Bölüm 2"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git"
msgstr "Git'e Giriş"
-#: command-list.h:212
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr "Önerilen Git çalışma akışlarına genel bakış"
@@ -23142,20 +23444,20 @@
msgid "cannot read $file for replaying"
msgstr "$file yeniden oynatım için okunamıyor"
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr "?? neden söz ediyorsun?"
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr "ikili arama başarısız: Komut verilmedi."
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr "$command çalıştırılıyor"
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23164,11 +23466,11 @@
"bisect çalıştırılamadı:\n"
"çıkış kodu $res, '$command' konumundan, < 0 veya >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr "bisect daha fazla çalıştırılamıyor"
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23177,11 +23479,11 @@
"ikili arama çalıştırılamadı:\n"
"'bisect_state $state' $res hata koduyla çıktı"
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr "ikili arama başarılı"
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr "İkili arama yapmıyoruz."
@@ -23214,7 +23516,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 +23527,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:205
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:215
#, 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:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' indekste halihazırda var"
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, 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:244
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' çıkış yapılan bir gönderiye iye değil"
-#: git-submodule.sh:273
+#: git-submodule.sh:275
#, 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:277
#, 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:285
#, 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:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23364,37 +23584,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:293
#, 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:305
#, 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:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "'$sm_path' altmodülü eklenemedi"
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "'$sm_path' altmodülü kaydı yapılamadı"
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, 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:602
#, 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:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23403,7 +23623,7 @@
"'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu "
"bulunamadı"
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23412,7 +23632,7 @@
"'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan "
"getirilmeye çalışılıyor"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23421,71 +23641,71 @@
"'$displaypath' altmodül yolunda getirme tamamlandı, ancak $sha1 içermiyor. "
"Bu gönderinin doğrudan getirilmesi başarısız oldu."
-#: git-submodule.sh:636
+#: git-submodule.sh:638
#, 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:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı"
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, 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:644
#, 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:649
#, 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:650
#, 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:655
#, 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:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Altmodül yolu '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yoluna özyinelenemedi"
-#: git-submodule.sh:896
+#: git-submodule.sh:878
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
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "beklenmedik kip $mod_dst"
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, 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
+#: git-submodule.sh:953
#, 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
+#: git-submodule.sh:956
#, 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"
@@ -23504,6 +23724,16 @@
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)"
diff --git a/pretty.c b/pretty.c
index 28afc70..2a3d46b 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 */
@@ -1767,7 +1768,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..071f2fb 100644
--- a/pretty.h
+++ b/pretty.h
@@ -43,6 +43,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
diff --git a/progress.c b/progress.c
index 19805ac..6d2dcff 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;
@@ -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;
}
@@ -320,6 +321,22 @@
{
finish_if_sparse(*p_progress);
+ if (p_progress && *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 && *p_progress
+ ? (*p_progress)->title
+ : NULL,
+ the_repository);
+
stop_progress_msg(p_progress, _("done"));
}
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..baaea12 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -101,7 +101,7 @@
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"))
@@ -241,6 +241,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..6343c47 100644
--- a/promisor-remote.h
+++ b/promisor-remote.h
@@ -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..d390391 100644
--- a/protocol.c
+++ b/protocol.c
@@ -39,7 +39,7 @@
return env;
}
- return protocol_v2;
+ return protocol_v0;
}
enum protocol_version determine_protocol_version_server(void)
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/range-diff.c b/range-diff.c
index f745567..40af086 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -63,6 +63,8 @@
"--output-indicator-old=<",
"--output-indicator-context=#",
"--no-abbrev-commit",
+ "--pretty=medium",
+ "--notes",
NULL);
if (other_arg)
argv_array_pushv(&cp.args, other_arg->argv);
@@ -106,20 +108,34 @@
continue;
}
+ if (!util) {
+ error(_("could not parse first line of `log` output: "
+ "did not start with 'commit ': '%s'"),
+ line);
+ string_list_clear(list, 1);
+ strbuf_release(&buf);
+ strbuf_release(&contents);
+ finish_command(&cp);
+ return -1;
+ }
+
if (starts_with(line, "diff --git")) {
struct patch patch = { 0 };
struct strbuf root = STRBUF_INIT;
int linenr = 0;
+ int orig_len;
in_header = 0;
strbuf_addch(&buf, '\n');
if (!util->diff_offset)
util->diff_offset = buf.len;
line[len - 1] = '\n';
+ orig_len = len;
len = parse_git_diff_header(&root, &linenr, 0, line,
len, size, &patch);
if (len < 0)
- die(_("could not parse git header '%.*s'"), (int)len, line);
+ die(_("could not parse git header '%.*s'"),
+ orig_len, line);
strbuf_addstr(&buf, " ## ");
if (patch.is_new > 0)
strbuf_addf(&buf, "%s (new)", patch.new_name);
diff --git a/ref-filter.c b/ref-filter.c
index b1812cb..bf7b702 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1976,10 +1976,9 @@
}
/*
- * 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
* change this to account for multiple levels (e.g. annotated tags
@@ -2296,7 +2295,7 @@
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;
}
@@ -2315,7 +2314,16 @@
if (cmp)
return cmp;
}
- return 0;
+ s = ref_sorting;
+ return s && s->ignore_case ?
+ strcasecmp(a->refname, b->refname) :
+ strcmp(a->refname, b->refname);
+}
+
+void ref_sorting_icase_all(struct ref_sorting *sorting, int flag)
+{
+ for (; sorting; sorting = sorting->next)
+ sorting->ignore_case = !!flag;
}
void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
diff --git a/ref-filter.h b/ref-filter.h
index f1dcff4..8ecc33c 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"
@@ -114,6 +114,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 the ignore_case flag for all elements of a sorting list */
+void ref_sorting_icase_all(struct ref_sorting *sorting, int flag);
/* Based on the given format and quote_style, fill the strbuf */
int format_ref_array_item(struct ref_array_item *info,
const struct ref_format *format,
diff --git a/refs.c b/refs.c
index 1ab0bb5..224ff66 100644
--- a/refs.c
+++ b/refs.c
@@ -321,50 +321,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)
{
@@ -1852,14 +1808,14 @@
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);
+ return r->refs_private;
}
/*
diff --git a/refs.h b/refs.h
index 545029c..a92d2c7 100644
--- a/refs.h
+++ b/refs.h
@@ -361,18 +361,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, "?*[");
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 561c33a..6516c7b 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2565,17 +2565,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;
}
diff --git a/remote-curl.c b/remote-curl.c
index e4cd321..1c9aa3d 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -12,7 +12,7 @@
#include "sideband.h"
#include "argv-array.h"
#include "credential.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "send-pack.h"
#include "protocol.h"
#include "quote.h"
diff --git a/remote.c b/remote.c
index c43196e..534c642 100644
--- a/remote.c
+++ b/remote.c
@@ -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));
branches[branches_nr++] = ret;
- if (len)
- ret->name = xstrndup(name, len);
- else
- ret->name = xstrdup(name);
+ ret->name = xstrndup(name, len);
ret->refname = xstrfmt("refs/heads/%s", ret->name);
return ret;
}
-static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
+static struct rewrite *make_rewrite(struct rewrites *r,
+ const char *base, size_t len)
{
struct rewrite *ret;
int i;
for (i = 0; i < r->rewrite_nr; i++) {
- if (len
- ? (len == r->rewrite[i]->baselen &&
- !strncmp(base, r->rewrite[i]->base, len))
- : !strcmp(base, r->rewrite[i]->base))
+ if (len == r->rewrite[i]->baselen &&
+ !strncmp(base, r->rewrite[i]->base, len))
return r->rewrite[i];
}
ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
ret = xcalloc(1, sizeof(struct rewrite));
r->rewrite[r->rewrite_nr++] = ret;
- if (len) {
- ret->base = xstrndup(base, len);
- ret->baselen = len;
- }
- else {
- ret->base = xstrdup(base);
- ret->baselen = strlen(base);
- }
+ ret->base = xstrndup(base, len);
+ ret->baselen = len;
return ret;
}
@@ -316,7 +305,7 @@
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;
@@ -470,7 +459,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);
@@ -1584,7 +1573,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;
}
diff --git a/repo-settings.c b/repo-settings.c
index a703e40..dc6817d 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -45,6 +45,8 @@
if (!repo_config_get_bool(r, "pack.usesparse", &value))
r->settings.pack_use_sparse = value;
+ UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
+
if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
@@ -52,7 +54,6 @@
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);
}
diff --git a/repository.c b/repository.c
index a4174dd..6f7f6f0 100644
--- a/repository.c
+++ b/repository.c
@@ -89,6 +89,10 @@
void repo_set_hash_algo(struct repository *repo, int hash_algo)
{
repo->hash_algo = &hash_algos[hash_algo];
+#ifndef ENABLE_SHA256
+ if (hash_algo != GIT_HASH_SHA1)
+ die(_("The hash algorithm %s is not supported in this build."), repo->hash_algo->name);
+#endif
}
/*
diff --git a/repository.h b/repository.h
index 040057d..6534fbb 100644
--- a/repository.h
+++ b/repository.h
@@ -67,8 +67,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.
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/revision.c b/revision.c
index 8136929..60cca8c 100644
--- a/revision.c
+++ b/revision.c
@@ -29,6 +29,8 @@
#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;
@@ -624,11 +626,133 @@
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 unsigned int count_bloom_filter_length_zero;
+
+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, "zero_length_filter", count_bloom_filter_length_zero);
+ 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;
+ int last_index;
+ int len;
+
+ if (!revs->commits)
+ return;
+
+ if (forbid_bloom_filters(&revs->prune_data))
+ return;
+
+ repo_parse_commit(revs->repo, revs->commits->item);
+
+ if (!revs->repo->objects->commit_graph)
+ return;
+
+ revs->bloom_filter_settings = revs->repo->objects->commit_graph->bloom_filter_settings;
+ if (!revs->bloom_filter_settings)
+ return;
+
+ pi = &revs->pruning.pathspec.items[0];
+ last_index = pi->len - 1;
+
+ /* remove single trailing slash from path, if needed */
+ if (pi->match[last_index] == '/') {
+ path_alloc = xstrdup(pi->match);
+ path_alloc[last_index] = '\0';
+ path = path_alloc;
+ } else
+ path = pi->match;
+
+ len = strlen(path);
+
+ revs->bloom_key = xmalloc(sizeof(struct bloom_key));
+ fill_bloom_key(path, len, revs->bloom_key, revs->bloom_filter_settings);
+
+ 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;
+
+ if (!revs->repo->objects->commit_graph)
+ return -1;
+
+ if (commit->generation == GENERATION_NUMBER_INFINITY)
+ return -1;
+
+ filter = get_bloom_filter(revs->repo, commit, 0);
+
+ if (!filter) {
+ count_bloom_filter_not_present++;
+ return -1;
+ }
+
+ if (!filter->len) {
+ count_bloom_filter_length_zero++;
+ return -1;
+ }
+
+ result = bloom_filter_contains(filter,
+ revs->bloom_key,
+ 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,11 +777,23 @@
return REV_TREE_SAME;
}
+ if (revs->bloom_key && !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;
+
+ if (!nth_parent)
+ if (bloom_ret == 1 && tree_difference == REV_TREE_SAME)
+ count_bloom_filter_false_positive++;
+
return tree_difference;
}
@@ -855,7 +991,7 @@
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 +1006,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:
@@ -897,6 +1045,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));
@@ -2241,6 +2393,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 +2421,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")) {
@@ -3019,7 +3177,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);
@@ -3362,6 +3521,8 @@
FOR_EACH_OBJECT_PROMISOR_ONLY);
}
+ if (revs->pruning.pathspec.nr == 1 && !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)
@@ -3379,6 +3540,7 @@
simplify_merges(revs);
if (revs->children.name)
set_children(revs);
+
return 0;
}
@@ -3602,6 +3764,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..93491b7 100644
--- a/revision.h
+++ b/revision.h
@@ -34,6 +34,9 @@
#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)
/*
* Indicates object was reached by traversal. i.e. not given by user on
* command-line or stdin.
@@ -43,7 +46,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 ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE)
#define TOPO_WALK_EXPLORED (1u<<27)
#define TOPO_WALK_INDEGREE (1u<<28)
@@ -56,6 +59,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 +134,7 @@
no_walk:2,
remove_empty_trees:1,
simplify_history:1,
+ show_pulls:1,
topo_order:1,
simplify_merges:1,
simplify_by_decoration:1,
@@ -203,7 +209,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,
@@ -291,6 +298,15 @@
struct revision_sources *sources;
struct topo_walk_info *topo_walk_info;
+
+ /* Commit graph bloom filter fields */
+ /* The bloom filter key for the pathspec */
+ struct bloom_key *bloom_key;
+ /*
+ * 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..9b3a57d 100644
--- a/run-command.c
+++ b/run-command.c
@@ -421,12 +421,12 @@
}
/*
- * 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], '/')) {
+ if (!has_dir_sep(out->argv[1])) {
char *program = locate_in_PATH(out->argv[1]);
if (program) {
free((char *)out->argv[1]);
@@ -1864,3 +1864,16 @@
return result;
}
+
+int run_auto_gc(int quiet)
+{
+ struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
+ int status;
+
+ argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
+ if (quiet)
+ argv_array_push(&argv_gc_auto, "--quiet");
+ status = run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
+ argv_array_clear(&argv_gc_auto);
+ return status;
+}
diff --git a/run-command.h b/run-command.h
index 0f3cc73..191dfcd 100644
--- a/run-command.h
+++ b/run-command.h
@@ -218,6 +218,11 @@
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_gc(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
diff --git a/send-pack.c b/send-pack.c
index 0407841..0abee22 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)
@@ -190,10 +191,8 @@
if (reader->line[0] == 'o' && reader->line[1] == 'k')
hint->status = REF_STATUS_OK;
- else {
+ else
hint->status = REF_STATUS_REMOTE_REJECT;
- ret = -1;
- }
hint->remote_status = xstrdup_or_null(msg);
/* start our next search from the next ref */
hint = hint->next;
@@ -322,29 +321,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)
@@ -489,7 +465,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:
diff --git a/sequencer.c b/sequencer.c
index e528225..fd7701c 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -32,6 +32,7 @@
#include "alias.h"
#include "commit-reach.h"
#include "rebase-interactive.h"
+#include "reset.h"
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
@@ -40,7 +41,7 @@
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")
@@ -419,25 +420,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 +438,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;
@@ -946,6 +937,8 @@
argv_array_push(&cmd.args, "--amend");
if (opts->gpg_sign)
argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
+ else
+ argv_array_push(&cmd.args, "--no-gpg-sign");
if (defmsg)
argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
else if (!(flags & EDIT_MSG))
@@ -1323,7 +1316,7 @@
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);
@@ -1433,9 +1426,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;
@@ -1460,8 +1463,12 @@
return res;
}
}
- if (res == 1)
+ if (res == 1) {
+ if (is_rebase_i(opts) && oid)
+ if (write_rebase_head(oid))
+ return -1;
return run_git_commit(r, msg_file, opts, flags);
+ }
return res;
}
@@ -1564,7 +1571,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;
}
@@ -1929,7 +1936,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;
@@ -1965,7 +1974,8 @@
} /* 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);
@@ -2485,8 +2495,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 +2508,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"))
@@ -2525,10 +2538,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 +2552,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_hex(buf.buf, &opts->squash_onto) < 0) {
+ ret = error(_("unusable squash-onto"));
+ goto done_rebase_i;
+ }
opts->have_squash_onto = 1;
}
- return 0;
+done_rebase_i:
+ strbuf_release(&buf);
+ return ret;
}
if (!file_exists(git_path_opts_file()))
@@ -3000,9 +3018,7 @@
p = short_commit_name(commit);
if (write_message(p, strlen(p), 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));
@@ -3113,7 +3129,7 @@
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",
@@ -3290,6 +3306,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);
@@ -3659,25 +3676,71 @@
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;
+
+ 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(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;
+ argv_array_push(&child.args, "stash");
+ argv_array_push(&child.args, "apply");
+ argv_array_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;
@@ -3688,30 +3751,67 @@
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);
+ argv_array_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) {
@@ -3757,7 +3857,7 @@
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"));
}
@@ -3799,8 +3899,11 @@
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));
@@ -3825,7 +3928,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 +3948,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),
@@ -4071,13 +4176,13 @@
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);
}
@@ -4289,7 +4394,8 @@
struct strbuf buf = STRBUF_INIT;
struct object_id oid;
- if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) &&
+ if (read_oneliner(&buf, rebase_path_stopped_sha(),
+ READ_ONELINER_SKIP_IF_EMPTY) &&
!get_oid_committish(buf.buf, &oid))
record_in_rewritten(&oid, peek_command(&todo_list, 0));
strbuf_release(&buf);
@@ -4591,6 +4697,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 +4752,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 +4765,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);
@@ -4819,14 +4931,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 +4972,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;
@@ -4947,6 +5065,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 +5075,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));
@@ -5079,7 +5200,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 +5211,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 +5385,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)) {
@@ -5315,3 +5439,24 @@
return 0;
}
+
+int sequencer_determine_whence(struct repository *r, enum commit_whence *whence)
+{
+ if (file_exists(git_path_cherry_pick_head(r))) {
+ 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..d31c41f 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);
@@ -134,7 +134,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 +150,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);
@@ -191,6 +191,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,6 +204,20 @@
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);
@@ -206,4 +226,5 @@
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/setup.c b/setup.c
index 5ea9285..65fe5ec 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;
}
@@ -623,6 +629,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 +680,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 +738,7 @@
}
/* #18, #26 */
- set_git_dir(gitdirenv);
+ set_git_dir(gitdirenv, 0);
free(gitfile);
return NULL;
}
@@ -751,7 +760,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 +772,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 +788,7 @@
}
/* cwd outside worktree */
- set_git_dir(gitdirenv);
+ set_git_dir(gitdirenv, 0);
free(gitfile);
return NULL;
}
@@ -808,7 +817,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 +826,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 +869,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 +890,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,10 +1266,12 @@
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;
clear_repository_format(&repo_fmt);
}
diff --git a/sha1-file.c b/sha1-file.c
index 6168867..ccd34dd 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -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,
@@ -676,20 +694,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)
@@ -868,9 +881,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);
}
/*
diff --git a/sha1-name.c b/sha1-name.c
index 5bb006e..0b8cb52 100644
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -8,7 +8,7 @@
#include "refs.h"
#include "remote.h"
#include "dir.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "packfile.h"
#include "object-store.h"
#include "repository.h"
@@ -1815,8 +1815,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);
}
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..b826de9 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->hash);
+ if (pos < 0)
+ return -1;
+ if (pos + 1 < the_repository->parsed_objects->grafts_nr)
+ MOVE_ARRAY(the_repository->parsed_objects->grafts + pos,
+ the_repository->parsed_objects->grafts + pos + 1,
+ the_repository->parsed_objects->grafts_nr - pos - 1);
+ the_repository->parsed_objects->grafts_nr--;
+ return 0;
+}
+
int is_repository_shallow(struct repository *r)
{
- /*
- * 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,6 +86,25 @@
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.
@@ -340,22 +366,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 +414,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 +428,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/strbuf.c b/strbuf.c
index bb0065c..2f1a7d3 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,6 +556,10 @@
return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0;
}
+ssize_t strbuf_write_fd(struct strbuf *sb, int fd)
+{
+ return sb->len ? write(fd, sb->buf, sb->len) : 0;
+}
#define STRBUF_MAXLINK (2*PATH_MAX)
@@ -690,6 +696,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..7062eb6 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,
@@ -468,6 +473,7 @@
* NUL bytes.
*/
ssize_t strbuf_write(struct strbuf *sb, FILE *stream);
+ssize_t strbuf_write_fd(struct strbuf *sb, int fd);
/**
* Read a line from a FILE *, overwriting the existing contents of
@@ -503,6 +509,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/submodule-config.c b/submodule-config.c
index 4d1c92d..e175dfb 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -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)
diff --git a/submodule.c b/submodule.c
index 31f391d..e2ef569 100644
--- a/submodule.c
+++ b/submodule.c
@@ -12,7 +12,7 @@
#include "diffcore.h"
#include "refs.h"
#include "string-list.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "argv-array.h"
#include "blob.h"
#include "thread-utils.h"
@@ -2168,13 +2168,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,12 +2185,13 @@
* 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);
@@ -2231,7 +2232,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 +2242,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..4dad649 100644
--- a/submodule.h
+++ b/submodule.h
@@ -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/t/README b/t/README
index 9afd61e..cf86383 100644
--- a/t/README
+++ b/t/README
@@ -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::
@@ -378,6 +379,11 @@
be written after every 'git commit' command, and overrides the
'core.commitGraph' setting to true.
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=<boolean>, when true, forces
+commit-graph write to compute and write changed path Bloom filters for
+every 'git commit-graph write', as if the `--changed-paths` option was
+passed in.
+
GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor
code path for utilizing a file system monitor to speed up detecting
new or changed files.
@@ -386,17 +392,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).
@@ -550,6 +552,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.
diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c
new file mode 100644
index 0000000..38cdc28
--- /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 (!argv[1])
+ 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..f0aa80b
--- /dev/null
+++ b/t/helper/test-bloom.c
@@ -0,0 +1,93 @@
+#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_bloom_filter(the_repository, c, 1);
+ 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)
+{
+ if (argc < 2)
+ usage(bloom_usage);
+
+ if (!strcmp(argv[1], "get_murmur3")) {
+ uint32_t hashed;
+ if (argc < 3)
+ usage(bloom_usage);
+ hashed = murmur3_seeded(0, argv[2], strlen(argv[2]));
+ printf("Murmur3 Hash with seed=0:0x%08x\n", hashed);
+ }
+
+ if (!strcmp(argv[1], "generate_filter")) {
+ struct bloom_filter filter;
+ int i = 2;
+ filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
+ filter.data = xcalloc(filter.len, sizeof(unsigned char));
+
+ if (argc - 1 < i)
+ usage(bloom_usage);
+
+ while (argv[i]) {
+ add_string_to_filter(argv[i], &filter);
+ i++;
+ }
+
+ print_bloom_filter(&filter);
+ }
+
+ if (!strcmp(argv[1], "get_filter_for_commit")) {
+ struct object_id oid;
+ const char *end;
+ if (argc < 3)
+ usage(bloom_usage);
+ if (parse_oid_hex(argv[2], &oid, &end))
+ die("cannot parse oid '%s'", argv[2]);
+ init_bloom_filters();
+ get_bloom_filter_for_commit(&oid);
+ }
+
+ return 0;
+}
diff --git a/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-sha1-array.c b/t/helper/test-oid-array.c
similarity index 83%
rename from t/helper/test-sha1-array.c
rename to t/helper/test-oid-array.c
index ad5e69f..ce9fd5f 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,7 +8,7 @@
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;
@@ -19,11 +19,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-pkt-line.c b/t/helper/test-pkt-line.c
index 282d536..12ca698 100644
--- a/t/helper/test-pkt-line.c
+++ b/t/helper/test-pkt-line.c
@@ -67,7 +67,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);
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-read-graph.c b/t/helper/test-read-graph.c
index f8a4617..6d0c962 100644
--- a/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@ -7,26 +7,15 @@
int cmd__read_graph(int argc, const char **argv)
{
struct commit_graph *graph = NULL;
- char *graph_name;
- int open_ok;
- int fd;
- struct stat st;
struct object_directory *odb;
setup_git_directory();
odb = the_repository->objects->odb;
- graph_name = get_commit_graph_filename(odb);
-
- open_ok = open_commit_graph(graph_name, &fd, &st);
- if (!open_ok)
- die_errno(_("Could not open commit-graph '%s'"), graph_name);
-
- graph = load_commit_graph_one_fd_st(fd, &st, odb);
+ 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),
@@ -45,6 +34,10 @@
printf(" commit_metadata");
if (graph->chunk_extra_edges)
printf(" extra_edges");
+ if (graph->chunk_bloom_indexes)
+ printf(" bloom_indexes");
+ if (graph->chunk_bloom_data)
+ printf(" bloom_data");
printf("\n");
UNLEAK(graph);
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-tool.c b/t/helper/test-tool.c
index c9a232d..590b2ef 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -14,6 +14,8 @@
};
static struct test_cmd cmds[] = {
+ { "advise", cmd__advise_if_enabled },
+ { "bloom", cmd__bloom },
{ "chmtime", cmd__chmtime },
{ "config", cmd__config },
{ "ctype", cmd__ctype },
@@ -36,6 +38,7 @@
{ "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 },
@@ -56,7 +59,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 +113,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..ddc8e99 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -4,6 +4,8 @@
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "git-compat-util.h"
+int cmd__advise_if_enabled(int argc, const char **argv);
+int cmd__bloom(int argc, const char **argv);
int cmd__chmtime(int argc, const char **argv);
int cmd__config(int argc, const char **argv);
int cmd__ctype(int argc, const char **argv);
@@ -46,7 +48,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/lib-credential.sh b/t/lib-credential.sh
old mode 100755
new mode 100644
index 937b831..dea2cbe
--- 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_cmp expect-stderr stderr
+ test_i18ncmp expect-stderr stderr
}
read_chunk() {
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-log-graph.sh b/t/lib-log-graph.sh
old mode 100755
new mode 100644
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
old mode 100755
new mode 100644
index 1dd17fc..64fc648
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -297,7 +297,7 @@
# - 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
@@ -621,11 +621,13 @@
# - 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.
@@ -658,22 +660,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 +685,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 +761,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 +803,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
@@ -908,7 +939,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 &&
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/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/t0000-basic.sh b/t/t0000-basic.sh
index 3e440c0..2ff176c 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
)
}
@@ -833,6 +831,19 @@
exit 1
fi
+test_expect_success 'lazy prereqs do not turn off tracing' "
+ run_sub_test_lib_test lazy-prereq-and-tracing \
+ 'lazy prereqs and -x' -v -x <<-\\EOF &&
+ test_lazy_prereq LAZY true
+
+ test_expect_success lazy 'test_have_prereq LAZY && echo trace'
+
+ test_done
+ EOF
+
+ grep 'echo trace' lazy-prereq-and-tracing/err
+"
+
test_expect_success 'tests clean up even on failures' "
run_sub_test_lib_test_err \
failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 26f8206..1edd5ae 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -392,13 +392,6 @@
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
-}
-
test_expect_success MINGW '.git hidden' '
rm -rf newdir &&
(
@@ -406,7 +399,7 @@
mkdir newdir &&
cd newdir &&
git init &&
- is_hidden .git
+ test_path_is_hidden .git
) &&
check_config newdir/.git false unset
'
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index d9fcc82..75ee9a9 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -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'
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/t0018-advice.sh b/t/t0018-advice.sh
new file mode 100755
index 0000000..e03554d
--- /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_i18ncmp expect actual
+'
+
+test_expect_success 'advice should be printed when config variable is set to true' '
+ cat >expect <<-\EOF &&
+ hint: This is a piece of advice
+ hint: Disable this message with "git config advice.nestedTag false"
+ EOF
+ test_config advice.nestedTag true &&
+ test-tool advise "This is a piece of advice" 2>actual &&
+ test_i18ncmp expect actual
+'
+
+test_expect_success 'advice should not be printed when config variable is set to false' '
+ test_config advice.nestedTag false &&
+ test-tool advise "This is a piece of advice" 2>actual &&
+ test_must_be_empty actual
+'
+
+test_done
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index dc664da..4bfffa9 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -364,6 +364,10 @@
S=$(file_size test.r) &&
S2=$(file_size test2.r) &&
S3=$(file_size "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+ M=$(git hash-object test.r) &&
+ M2=$(git hash-object test2.r) &&
+ M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+ EMPTY=$(git hash-object /dev/null) &&
filter_git add . &&
cat >expected.log <<-EOF &&
@@ -378,14 +382,16 @@
test_cmp_count expected.log debug.log &&
git commit -m "test commit 2" &&
+ MASTER=$(git rev-parse --verify master) &&
+ META="ref=refs/heads/master treeish=$MASTER" &&
rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" &&
filter_git checkout --quiet --no-progress . &&
cat >expected.log <<-EOF &&
START
init handshake complete
- IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]
- IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
+ IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
STOP
EOF
test_cmp_exclude_clean expected.log debug.log &&
@@ -406,10 +412,10 @@
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 +426,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=$(file_size test.r) &&
+ S2=$(file_size test2.r) &&
+ S3=$(file_size "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+ M=$(git hash-object test.r) &&
+ M2=$(git hash-object test2.r) &&
+ M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+ EMPTY=$(git hash-object /dev/null) &&
+
+ MASTER=$(git rev-parse --verify master) &&
+
+ cp "$TEST_ROOT/test.o" test5.r &&
+ git add test5.r &&
+ git commit -m "test commit 3" &&
+ git checkout empty-branch &&
+ filter_git rebase --onto empty-branch master^^ master &&
+ MASTER2=$(git rev-parse --verify master) &&
+ META="ref=refs/heads/master treeish=$MASTER2" &&
+ cat >expected.log <<-EOF &&
+ START
+ init handshake complete
+ IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK]
+ IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+ STOP
+ EOF
+ test_cmp_exclude_clean expected.log debug.log &&
+
+ git reset --hard empty-branch &&
+ filter_git reset --hard $MASTER &&
+ META="treeish=$MASTER" &&
+ cat >expected.log <<-EOF &&
+ START
+ init handshake complete
+ IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+ STOP
+ EOF
+ test_cmp_exclude_clean expected.log debug.log &&
+
+ git branch old-master $MASTER &&
+ git reset --hard empty-branch &&
+ filter_git reset --hard old-master &&
+ META="ref=refs/heads/old-master treeish=$MASTER" &&
+ cat >expected.log <<-EOF &&
+ START
+ init handshake complete
+ IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+ STOP
+ EOF
+ test_cmp_exclude_clean expected.log debug.log &&
+
+ git checkout -b merge empty-branch &&
+ git branch -f master $MASTER2 &&
+ filter_git merge master &&
+ META="treeish=$MASTER2" &&
+ cat >expected.log <<-EOF &&
+ START
+ init handshake complete
+ IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK]
+ IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+ STOP
+ EOF
+ test_cmp_exclude_clean expected.log debug.log &&
+
+ filter_git archive master >/dev/null &&
+ META="ref=refs/heads/master treeish=$MASTER2" &&
+ cat >expected.log <<-EOF &&
+ START
+ init handshake complete
+ IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK]
+ IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+ STOP
+ EOF
+ test_cmp_exclude_clean expected.log debug.log &&
+
+ TREE="$(git rev-parse $MASTER2^{tree})" &&
+ filter_git archive $TREE >/dev/null &&
+ META="treeish=$TREE" &&
+ cat >expected.log <<-EOF &&
+ START
+ init handshake complete
+ IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+ IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0 [OK]
+ IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+ IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+ STOP
+ EOF
+ test_cmp_exclude_clean expected.log debug.log
+ )
+'
+
test_expect_success PERL 'required process filter takes precedence' '
test_config_global filter.protocol.clean false &&
test_config_global filter.protocol.process "rot13-filter.pl debug.log clean" &&
@@ -519,17 +636,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 &&
@@ -578,6 +700,10 @@
S=$(file_size test.r) &&
S2=$(file_size test2.r) &&
SF=$(file_size smudge-write-fail.r) &&
+ M=$(git hash-object test.r) &&
+ M2=$(git hash-object test2.r) &&
+ MF=$(git hash-object smudge-write-fail.r) &&
+ rm -f debug.log &&
git add . &&
rm -f *.r &&
@@ -591,11 +717,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 &&
@@ -629,6 +755,10 @@
S=$(file_size test.r) &&
S2=$(file_size test2.r) &&
SE=$(file_size error.r) &&
+ M=$(git hash-object test.r) &&
+ M2=$(git hash-object test2.r) &&
+ ME=$(git hash-object error.r) &&
+ rm -f debug.log &&
git add . &&
rm -f *.r &&
@@ -637,9 +767,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 +795,21 @@
echo "error this blob and all future blobs" >abort.o &&
cp abort.o abort.r &&
+ M="blob=$(git hash-object abort.r)" &&
+ rm -f debug.log &&
SA=$(file_size abort.r) &&
git add . &&
rm -f *.r &&
+
# Note: This test assumes that Git filters files in alphabetical
# order ("abort.r" before "test.r").
filter_git checkout --quiet --no-progress . &&
cat >expected.log <<-EOF &&
START
init handshake complete
- IN: smudge abort.r $SA [OK] -- [ABORT]
+ IN: smudge abort.r $M $SA [OK] -- [ABORT]
STOP
EOF
test_cmp_exclude_clean expected.log debug.log &&
@@ -727,27 +860,29 @@
) &&
S=$(file_size "$TEST_ROOT/test.o") &&
+ PM="ref=refs/heads/master treeish=$(git -C repo rev-parse --verify master) " &&
+ M="${PM}blob=$(git -C repo rev-parse --verify master:test.a)" &&
cat >a.exp <<-EOF &&
START
init handshake complete
- IN: smudge test.a $S [OK] -- OUT: $S . [OK]
- IN: smudge test-delay10.a $S [OK] -- [DELAYED]
- IN: smudge test-delay11.a $S [OK] -- [DELAYED]
- IN: smudge test-delay20.a $S [OK] -- [DELAYED]
+ IN: smudge test.a $M $S [OK] -- OUT: $S . [OK]
+ IN: smudge test-delay10.a $M $S [OK] -- [DELAYED]
+ IN: smudge test-delay11.a $M $S [OK] -- [DELAYED]
+ IN: smudge test-delay20.a $M $S [OK] -- [DELAYED]
IN: list_available_blobs test-delay10.a test-delay11.a [OK]
- IN: smudge test-delay10.a 0 [OK] -- OUT: $S . [OK]
- IN: smudge test-delay11.a 0 [OK] -- OUT: $S . [OK]
+ IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK]
+ IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK]
IN: list_available_blobs test-delay20.a [OK]
- IN: smudge test-delay20.a 0 [OK] -- OUT: $S . [OK]
+ IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK]
IN: list_available_blobs [OK]
STOP
EOF
cat >b.exp <<-EOF &&
START
init handshake complete
- IN: smudge test-delay10.b $S [OK] -- [DELAYED]
+ IN: smudge test-delay10.b $M $S [OK] -- [DELAYED]
IN: list_available_blobs test-delay10.b [OK]
- IN: smudge test-delay10.b 0 [OK] -- OUT: $S . [OK]
+ IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK]
IN: list_available_blobs [OK]
STOP
EOF
@@ -767,8 +902,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 &&
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index 4701072..cd32a82 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -135,7 +135,13 @@
if ( exists $DELAY{$pathname} and $DELAY{$pathname}{"requested"} == 0 ) {
$DELAY{$pathname}{"requested"} = 1;
}
+ } elsif ($buffer =~ /^(ref|treeish|blob)=/) {
+ print $debug " $buffer";
} else {
+ # In general, filters need to be graceful about
+ # new metadata, since it's documented that we
+ # can pass any key-value pairs, but for tests,
+ # let's be a little stricter.
die "Unknown message '$buffer'";
}
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 3483b72..f8178ee 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -54,7 +54,7 @@
-A, --alias-source <string>
get a string
-Z, --alias-target <string>
- get a string
+ alias of --alias-source
EOF
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 2ea2d00..56db5c8 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -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-sha1-array.sh
index 5dda570..45685af 100755
--- a/t/t0064-sha1-array.sh
+++ b/t/t0064-sha1-array.sh
@@ -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
'
@@ -28,7 +28,7 @@
echoid append 88 44 aa 55 &&
echoid append 88 44 aa 55 &&
echo for_each_unique
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
test_cmp expect actual
'
@@ -36,7 +36,7 @@
{
echoid append 88 44 aa 55 &&
echoid lookup 55
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
n=$(cat actual) &&
test "$n" -eq 1
'
@@ -45,7 +45,7 @@
{
echoid append 88 44 aa 55 &&
echoid lookup 33
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
n=$(cat actual) &&
test "$n" -lt 0
'
@@ -55,7 +55,7 @@
echoid append 88 44 aa 55 &&
echoid append 88 44 aa 55 &&
echoid lookup 55
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
n=$(cat actual) &&
test "$n" -ge 2 &&
test "$n" -le 3
@@ -66,7 +66,7 @@
echoid append 88 44 aa 55 &&
echoid append 88 44 aa 55 &&
echoid lookup 66
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
n=$(cat actual) &&
test "$n" -lt 0
'
@@ -81,7 +81,7 @@
echo "append $id1" &&
echo "append $id2" &&
echoid lookup 55
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
n=$(cat actual) &&
test "$n" -eq 0
'
@@ -90,7 +90,7 @@
{
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/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..232ba2c
--- /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:0
+ Filter_Data:
+ 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:0
+ Filter_Data:
+ EOF
+ test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+ test_cmp expect actual
+'
+
+test_done
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 39f097e..bc2d740 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -22,6 +22,11 @@
exit 0
EOF
+ write_script git-credential-quit <<-\EOF &&
+ . ./dump
+ echo quit=1
+ EOF
+
write_script git-credential-verbatim <<-\EOF &&
user=$1; shift
pass=$1; shift
@@ -35,43 +40,71 @@
test_expect_success 'credential_fill invokes helper' '
check fill "verbatim foo bar" <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=foo
password=bar
--
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
EOF
'
test_expect_success 'credential_fill invokes multiple helpers' '
check fill useless "verbatim foo bar" <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=foo
password=bar
--
useless: get
+ useless: protocol=http
+ useless: host=example.com
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
EOF
'
test_expect_success 'credential_fill stops when we get a full response' '
check fill "verbatim one two" "verbatim three four" <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=one
password=two
--
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
EOF
'
test_expect_success 'credential_fill continues through partial response' '
check fill "verbatim one \"\"" "verbatim two three" <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=two
password=three
--
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
verbatim: username=one
EOF
'
@@ -97,14 +130,20 @@
test_expect_success 'credential_approve calls all helpers' '
check approve useless "verbatim one two" <<-\EOF
+ protocol=http
+ host=example.com
username=foo
password=bar
--
--
useless: store
+ useless: protocol=http
+ useless: host=example.com
useless: username=foo
useless: password=bar
verbatim: store
+ verbatim: protocol=http
+ verbatim: host=example.com
verbatim: username=foo
verbatim: password=bar
EOF
@@ -112,6 +151,8 @@
test_expect_success 'do not bother storing password-less credential' '
check approve useless <<-\EOF
+ protocol=http
+ host=example.com
username=foo
--
--
@@ -121,14 +162,20 @@
test_expect_success 'credential_reject calls all helpers' '
check reject useless "verbatim one two" <<-\EOF
+ protocol=http
+ host=example.com
username=foo
password=bar
--
--
useless: erase
+ useless: protocol=http
+ useless: host=example.com
useless: username=foo
useless: password=bar
verbatim: erase
+ verbatim: protocol=http
+ verbatim: host=example.com
verbatim: username=foo
verbatim: password=bar
EOF
@@ -136,33 +183,49 @@
test_expect_success 'usernames can be preserved' '
check fill "verbatim \"\" three" <<-\EOF
+ protocol=http
+ host=example.com
username=one
--
+ protocol=http
+ host=example.com
username=one
password=three
--
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
verbatim: username=one
EOF
'
test_expect_success 'usernames can be overridden' '
check fill "verbatim two three" <<-\EOF
+ protocol=http
+ host=example.com
username=one
--
+ protocol=http
+ host=example.com
username=two
password=three
--
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
verbatim: username=one
EOF
'
test_expect_success 'do not bother completing already-full credential' '
check fill "verbatim three four" <<-\EOF
+ protocol=http
+ host=example.com
username=one
password=two
--
+ protocol=http
+ host=example.com
username=one
password=two
--
@@ -174,23 +237,31 @@
# askpass helper is run, we know the internal getpass is working.
test_expect_success 'empty helper list falls back to internal getpass' '
check fill <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=askpass-username
password=askpass-password
--
- askpass: Username:
- askpass: Password:
+ askpass: Username for '\''http://example.com'\'':
+ askpass: Password for '\''http://askpass-username@example.com'\'':
EOF
'
test_expect_success 'internal getpass does not ask for known username' '
check fill <<-\EOF
+ protocol=http
+ host=example.com
username=foo
--
+ protocol=http
+ host=example.com
username=foo
password=askpass-password
--
- askpass: Password:
+ askpass: Password for '\''http://foo@example.com'\'':
EOF
'
@@ -202,7 +273,11 @@
test_expect_success 'respect configured credentials' '
test_config credential.helper "$HELPER" &&
check fill <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=foo
password=bar
--
@@ -291,6 +366,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
@@ -419,21 +539,157 @@
test_expect_success 'helpers can abort the process' '
test_must_fail git \
- -c credential.helper="!f() { echo quit=1; }; f" \
+ -c credential.helper=quit \
-c credential.helper="verbatim foo bar" \
- credential fill >stdout &&
- test_must_be_empty stdout
+ credential fill >stdout 2>stderr <<-\EOF &&
+ protocol=http
+ host=example.com
+ EOF
+ test_must_be_empty stdout &&
+ cat >expect <<-\EOF &&
+ quit: get
+ quit: protocol=http
+ quit: host=example.com
+ fatal: credential helper '\''quit'\'' told us to quit
+ EOF
+ test_i18ncmp expect stderr
'
test_expect_success 'empty helper spec resets helper list' '
test_config credential.helper "verbatim file file" &&
check fill "" "verbatim cmdline cmdline" <<-\EOF
+ protocol=http
+ host=example.com
--
+ protocol=http
+ host=example.com
username=cmdline
password=cmdline
--
verbatim: get
+ verbatim: protocol=http
+ verbatim: host=example.com
EOF
'
+test_expect_success 'url parser rejects embedded newlines' '
+ test_must_fail git credential fill 2>stderr <<-\EOF &&
+ url=https://one.example.com?%0ahost=two.example.com/
+ EOF
+ cat >expect <<-\EOF &&
+ warning: url contains a newline in its path component: https://one.example.com?%0ahost=two.example.com/
+ fatal: credential url cannot be parsed: https://one.example.com?%0ahost=two.example.com/
+ EOF
+ test_i18ncmp expect stderr
+'
+
+test_expect_success 'host-less URLs are parsed as empty host' '
+ check fill "verbatim foo bar" <<-\EOF
+ url=cert:///path/to/cert.pem
+ --
+ protocol=cert
+ host=
+ path=path/to/cert.pem
+ username=foo
+ password=bar
+ --
+ verbatim: get
+ verbatim: protocol=cert
+ verbatim: host=
+ verbatim: path=path/to/cert.pem
+ EOF
+'
+
+test_expect_success 'credential system refuses to work with missing host' '
+ test_must_fail git credential fill 2>stderr <<-\EOF &&
+ protocol=http
+ EOF
+ cat >expect <<-\EOF &&
+ fatal: refusing to work with credential missing host field
+ EOF
+ test_i18ncmp expect stderr
+'
+
+test_expect_success 'credential system refuses to work with missing protocol' '
+ test_must_fail git credential fill 2>stderr <<-\EOF &&
+ host=example.com
+ EOF
+ cat >expect <<-\EOF &&
+ fatal: refusing to work with credential missing protocol field
+ EOF
+ test_i18ncmp expect stderr
+'
+
+# usage: check_host_and_path <url> <expected-host> <expected-path>
+check_host_and_path () {
+ # we always parse the path component, but we need this to make sure it
+ # is passed to the helper
+ test_config credential.useHTTPPath true &&
+ check fill "verbatim user pass" <<-EOF
+ url=$1
+ --
+ protocol=https
+ host=$2
+ path=$3
+ username=user
+ password=pass
+ --
+ verbatim: get
+ verbatim: protocol=https
+ verbatim: host=$2
+ verbatim: path=$3
+ EOF
+}
+
+test_expect_success 'url parser handles bare query marker' '
+ check_host_and_path https://example.com?foo.git example.com ?foo.git
+'
+
+test_expect_success 'url parser handles bare fragment marker' '
+ check_host_and_path https://example.com#foo.git example.com "#foo.git"
+'
+
+test_expect_success 'url parser not confused by encoded markers' '
+ check_host_and_path https://example.com%23%3f%2f/foo.git \
+ "example.com#?/" foo.git
+'
+
+test_expect_success 'credential config with partial URLs' '
+ echo "echo password=yep" | write_script git-credential-yep &&
+ test_write_lines url=https://user@example.com/repo.git >stdin &&
+ for partial in \
+ example.com \
+ user@example.com \
+ https:// \
+ https://example.com \
+ https://example.com/ \
+ https://user@example.com \
+ https://user@example.com/ \
+ https://example.com/repo.git \
+ https://user@example.com/repo.git \
+ /repo.git
+ do
+ git -c credential.$partial.helper=yep \
+ credential fill <stdin >stdout &&
+ grep yep stdout ||
+ return 1
+ done &&
+
+ for partial in \
+ dont.use.this \
+ http:// \
+ /repo
+ do
+ git -c credential.$partial.helper=yep \
+ credential fill <stdin >stdout &&
+ ! grep yep stdout ||
+ return 1
+ done &&
+
+ git -c credential.$partial.helper=yep \
+ -c credential.with%0anewline.username=uh-oh \
+ credential fill <stdin >stdout 2>stderr &&
+ test_i18ngrep "skipping credential lookup for key" stderr
+'
+
test_done
diff --git a/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/t0500-progress-display.sh b/t/t0500-progress-display.sh
index d2d088d..1ed1df3 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -283,4 +283,30 @@
test_i18ncmp expect out
'
+test_expect_success 'progress generates traces' '
+ cat >in <<-\EOF &&
+ throughput 102400 1000
+ update
+ progress 10
+ throughput 204800 2000
+ update
+ progress 20
+ throughput 307200 3000
+ update
+ progress 30
+ throughput 409600 4000
+ update
+ progress 40
+ EOF
+
+ GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress --total=40 \
+ "Working hard" <in 2>stderr &&
+
+ # t0212/parse_events.perl intentionally omits regions and data.
+ grep -e "region_enter" -e "\"category\":\"progress\"" trace.event &&
+ grep -e "region_leave" -e "\"category\":\"progress\"" trace.event &&
+ grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
+ grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
+'
+
test_done
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index eb44baf..140f459 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -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,18 +239,19 @@
test_must_be_empty result
'
-test_expect_success 'print errors when failed to update worktree' '
+test_expect_success 'print warnings when some worktree updates disabled' '
echo sub >.git/info/sparse-checkout &&
git checkout -f init &&
mkdir sub &&
touch sub/added sub/addedtoo &&
- test_must_fail git checkout top 2>actual &&
+ # Use -q to suppress "Previous HEAD position" and "Head is now at" msgs
+ git checkout -q top 2>actual &&
cat >expected <<\EOF &&
-error: The following untracked working tree files would be overwritten by checkout:
+warning: The following paths were already present and thus not updated despite sparse patterns:
sub/added
sub/addedtoo
-Please move or remove them before you switch branches.
-Aborting
+
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
EOF
test_i18ncmp expected actual
'
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 44a9120..88cdde2 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -106,10 +106,8 @@
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 +275,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 +300,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 +321,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 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000 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/t1400-update-ref.sh b/t/t1400-update-ref.sh
index a6224ef..e1197ac 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -1354,15 +1354,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)
@@ -1404,4 +1395,135 @@
! test_cmp main-head worktree-head
'
+test_expect_success 'transaction handles empty commit' '
+ cat >stdin <<-EOF &&
+ start
+ prepare
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start prepare commit >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction handles empty commit with missing prepare' '
+ cat >stdin <<-EOF &&
+ start
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start commit >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction handles sole commit' '
+ cat >stdin <<-EOF &&
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" commit >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction handles empty abort' '
+ cat >stdin <<-EOF &&
+ start
+ prepare
+ abort
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start prepare abort >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction exits on multiple aborts' '
+ cat >stdin <<-EOF &&
+ abort
+ abort
+ EOF
+ test_must_fail git update-ref --stdin <stdin >actual 2>err &&
+ printf "%s: ok\n" abort >expect &&
+ test_cmp expect actual &&
+ grep "fatal: transaction is closed" err
+'
+
+test_expect_success 'transaction exits on start after prepare' '
+ cat >stdin <<-EOF &&
+ prepare
+ start
+ EOF
+ test_must_fail git update-ref --stdin <stdin 2>err >actual &&
+ printf "%s: ok\n" prepare >expect &&
+ test_cmp expect actual &&
+ grep "fatal: prepared transactions can only be closed" err
+'
+
+test_expect_success 'transaction handles empty abort with missing prepare' '
+ cat >stdin <<-EOF &&
+ start
+ abort
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start abort >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction handles sole abort' '
+ cat >stdin <<-EOF &&
+ abort
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" abort >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction can handle commit' '
+ cat >stdin <<-EOF &&
+ start
+ create $a HEAD
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start commit >expect &&
+ test_cmp expect actual &&
+ git rev-parse HEAD >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction can handle abort' '
+ cat >stdin <<-EOF &&
+ start
+ create $b HEAD
+ abort
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start abort >expect &&
+ test_cmp expect actual &&
+ test_path_is_missing .git/$b
+'
+
+test_expect_success 'transaction aborts by default' '
+ cat >stdin <<-EOF &&
+ start
+ create $b HEAD
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start >expect &&
+ test_cmp expect actual &&
+ test_path_is_missing .git/$b
+'
+
+test_expect_success 'transaction with prepare aborts by default' '
+ cat >stdin <<-EOF &&
+ start
+ create $b HEAD
+ prepare
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start prepare >expect &&
+ test_cmp expect actual &&
+ test_path_is_missing .git/$b
+'
+
test_done
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index d09eff5..91a6e34 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -133,6 +133,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 +257,22 @@
test_i18ngrep "error in tree .*contains duplicate file entries" out
'
+test_expect_success 'tree object with dublicate 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) &&
+ printf "100644 blob %s\t%s\n" $blob x.1 >badtree &&
+ printf "100644 blob %s\t%s\n" $blob x >>badtree &&
+ printf "040000 tree %s\t%s\n" $tree x >>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
+'
+
test_expect_success 'unparseable tree object' '
test_oid_cache <<-\EOF &&
junk sha1:twenty-bytes-of-junk
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index bbca7ef..2158315 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -238,4 +238,26 @@
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_done
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh
index 076d0df..89e5a14 100755
--- a/t/t2070-restore.sh
+++ b/t/t2070-restore.sh
@@ -69,6 +69,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 &&
(
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 69ffe86..52585ec 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -152,7 +152,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/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 0aefada..ffdfb16 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -91,4 +91,125 @@
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_done
diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index d314599..e29c284 100755
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t3033-merge-toplevel.sh
@@ -142,6 +142,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 +160,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/t3206-range-diff.sh b/t/t3206-range-diff.sh
index bd808f8..e024cff 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -513,6 +513,16 @@
git -c diff.noprefix=true range-diff HEAD^...
'
+test_expect_success 'basic with modified format.pretty with suffix' '
+ git -c format.pretty="format:commit %H%d%n" range-diff \
+ master..topic master..unmodified
+'
+
+test_expect_success 'basic with modified format.pretty without "commit "' '
+ git -c format.pretty="format:%H%n" range-diff \
+ master..topic master..unmodified
+'
+
test_expect_success 'range-diff compares notes by default' '
git notes add -m "topic note" topic &&
git notes add -m "unmodified note" unmodified &&
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index a1ec501..6e03271 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -162,4 +162,81 @@
git rebase --skip
'
+test_expect_success '--reapply-cherry-picks' '
+ git init repo &&
+
+ # O(1-10) -- O(1-11) -- O(0-10) master
+ # \
+ # -- O(1-11) -- O(1-12) otherbranch
+
+ printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
+ git -C repo add file.txt &&
+ git -C repo commit -m "base commit" &&
+
+ printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+ git -C repo commit -a -m "add 11" &&
+
+ printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
+ git -C repo commit -a -m "add 0 delete 11" &&
+
+ git -C repo checkout -b otherbranch HEAD^^ &&
+ printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+ git -C repo commit -a -m "add 11 in another branch" &&
+
+ printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
+ git -C repo commit -a -m "add 12 in another branch" &&
+
+ # Regular rebase fails, because the 1-11 commit is deduplicated
+ test_must_fail git -C repo rebase --merge master 2> err &&
+ test_i18ngrep "error: could not apply.*add 12 in another branch" err &&
+ git -C repo rebase --abort &&
+
+ # With --reapply-cherry-picks, it works
+ git -C repo rebase --merge --reapply-cherry-picks master
+'
+
+test_expect_success '--reapply-cherry-picks refrains from reading unneeded blobs' '
+ git init server &&
+
+ # O(1-10) -- O(1-11) -- O(1-12) master
+ # \
+ # -- O(0-10) otherbranch
+
+ printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
+ git -C server add file.txt &&
+ git -C server commit -m "merge base" &&
+
+ printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
+ git -C server commit -a -m "add 11" &&
+
+ printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
+ git -C server commit -a -m "add 12" &&
+
+ git -C server checkout -b otherbranch HEAD^^ &&
+ printf "Line %d\n" $(test_seq 0 10) >server/file.txt &&
+ git -C server commit -a -m "add 0" &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+
+ git clone --filter=blob:none "file://$(pwd)/server" client &&
+ git -C client checkout origin/master &&
+ git -C client checkout origin/otherbranch &&
+
+ # Sanity check to ensure that the blobs from the merge base and "add
+ # 11" are missing
+ git -C client rev-list --objects --all --missing=print >missing_list &&
+ MERGE_BASE_BLOB=$(git -C server rev-parse master^^:file.txt) &&
+ ADD_11_BLOB=$(git -C server rev-parse master^:file.txt) &&
+ grep "[?]$MERGE_BASE_BLOB" missing_list &&
+ grep "[?]$ADD_11_BLOB" missing_list &&
+
+ git -C client rebase --merge --reapply-cherry-picks origin/master &&
+
+ # The blob from the merge base had to be fetched, but not "add 11"
+ git -C client rev-list --objects --all --missing=print >missing_list &&
+ ! grep "[?]$MERGE_BASE_BLOB" missing_list &&
+ grep "[?]$ADD_11_BLOB" missing_list
+'
+
test_done
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index ee8a8db..a927774 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -29,6 +29,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 &&
@@ -85,6 +92,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..4a7d21f 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -187,7 +187,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 +196,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 +214,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' '
@@ -279,7 +279,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
'
@@ -322,7 +322,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
'
@@ -339,7 +339,7 @@
git rebase -i --onto master HEAD~2
) &&
test B = $(cat file7) &&
- test $(git rev-parse HEAD^) = $(git rev-parse master)
+ test_cmp_rev HEAD^ master
'
test_expect_success 'retain authorship when squashing' '
@@ -398,9 +398,9 @@
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,7 +432,7 @@
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
'
@@ -739,7 +739,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,7 +798,7 @@
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' '
@@ -821,7 +821,7 @@
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_cmp_rev master^ HEAD^ &&
FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
git rebase -i A &&
git show HEAD^ | grep "D changed" &&
@@ -885,7 +885,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
'
@@ -1734,6 +1734,32 @@
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
+'
+
# This must be the last test in this file
test_expect_success '$EDITOR and friends are unchanged' '
test_editor_unchanged
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 61b76f3..927a4f4 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -89,22 +89,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
'
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 093de90..7bab600 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -424,4 +424,20 @@
! grep first actual
'
+test_expect_success 'fixup a fixup' '
+ echo 0to-fixup >file0 &&
+ test_tick &&
+ git commit -m "to-fixup" file0 &&
+ test_tick &&
+ git commit --squash HEAD -m X --allow-empty &&
+ test_tick &&
+ git commit --squash HEAD^ -m Y --allow-empty &&
+ test_tick &&
+ git commit -m "squash! $(git rev-parse HEAD^)" -m Z --allow-empty &&
+ test_tick &&
+ git commit -m "squash! $(git rev-parse HEAD^^)" -m W --allow-empty &&
+ git rebase -ki --autosquash HEAD~5 &&
+ test XZWY = $(git show | tr -cd W-Z)
+'
+
test_done
diff --git a/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/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index d934583..1f32faa 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -4,15 +4,6 @@
. ./test-lib.sh
-count () {
- i=0
- while test $i -lt $1
- do
- echo "$i"
- i=$(($i+1))
- done
-}
-
scramble () {
i=0
while read x
@@ -26,76 +17,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 master &&
+ 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 master >/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 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 '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 master &&
+ git checkout -q -f squashed &&
+ git reset -q --soft HEAD~2 &&
+ git commit -q -m squashed &&
+ git checkout -q other^{} &&
+ test_must_fail git rebase squashed &&
+ git rebase --quit
+'
test_done
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index b97ea62..ca33173 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -184,6 +184,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 &&
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/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/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 78851b9..1725627 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@ -47,11 +47,31 @@
test_rebase 'G F C E D B A' --no-fork-point
test_rebase 'G F C D B A' --no-fork-point --onto D
test_rebase 'G F C B A' --no-fork-point --keep-base
+
test_rebase 'G F E D B A' --fork-point refs/heads/master
+test_rebase 'G F E D B A' --fork-point master
+
test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
+test_rebase 'G F D B A' --fork-point --onto D master
+
test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
+test_rebase 'G F B A' --fork-point --keep-base master
+
test_rebase 'G F C E D B A' refs/heads/master
+test_rebase 'G F C E D B A' master
+
test_rebase 'G F C D B A' --onto D refs/heads/master
+test_rebase 'G F C D B A' --onto D master
+
test_rebase 'G F C B A' --keep-base refs/heads/master
+test_rebase 'G F C B A' --keep-base master
+
+test_expect_success 'git rebase --fork-point with ambigous refname' '
+ git checkout master &&
+ git checkout -b one &&
+ git checkout side &&
+ git tag one &&
+ test_must_fail git rebase --fork-point --onto D one
+'
test_done
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 6c9d4a1..6f0452c 100755
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh
@@ -28,10 +28,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,9 +43,21 @@
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 &&
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
new file mode 100755
index 0000000..b47c59c
--- /dev/null
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Doan Tran Cong Danh
+#
+
+test_description='test rebase --[no-]gpg-sign'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-rebase.sh"
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+if ! test_have_prereq GPG
+then
+ skip_all='skip all test rebase --[no-]gpg-sign, gpg not available'
+ test_done
+fi
+
+test_rebase_gpg_sign () {
+ local must_fail= will=will fake_editor=
+ if test "x$1" = "x!"
+ then
+ must_fail=test_must_fail
+ will="won't"
+ shift
+ fi
+ conf=$1
+ shift
+ test_expect_success "rebase $* with commit.gpgsign=$conf $will sign commit" "
+ git reset two &&
+ git config commit.gpgsign $conf &&
+ set_fake_editor &&
+ FAKE_LINES='r 1 p 2' git rebase --force-rebase --root $* &&
+ $must_fail git verify-commit HEAD^ &&
+ $must_fail git verify-commit HEAD
+ "
+}
+
+test_expect_success 'setup' '
+ test_commit one &&
+ test_commit two &&
+ test_must_fail git verify-commit HEAD &&
+ test_must_fail git verify-commit HEAD^
+'
+
+test_expect_success 'setup: merge commit' '
+ test_commit fork-point &&
+ git switch -c side &&
+ test_commit three &&
+ git switch master &&
+ git merge --no-ff side &&
+ git tag merged
+'
+
+test_rebase_gpg_sign ! false
+test_rebase_gpg_sign true
+test_rebase_gpg_sign ! true --no-gpg-sign
+test_rebase_gpg_sign ! true --gpg-sign --no-gpg-sign
+test_rebase_gpg_sign false --no-gpg-sign --gpg-sign
+test_rebase_gpg_sign true -i
+test_rebase_gpg_sign ! true -i --no-gpg-sign
+test_rebase_gpg_sign ! true -i --gpg-sign --no-gpg-sign
+test_rebase_gpg_sign false -i --no-gpg-sign --gpg-sign
+
+test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
+ git reset --hard merged &&
+ git config commit.gpgsign true &&
+ git rebase -p --no-gpg-sign --onto=one fork-point master &&
+ test_must_fail git verify-commit HEAD
+'
+
+test_done
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 9bd482c..752bc43 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -161,6 +161,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 &&
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 793bcc7..5b94fda 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
'
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/t3700-add.sh b/t/t3700-add.sh
index 88bc7998..b7d4ba6 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
'
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 5bae6e5..b3d8bb7 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -780,7 +780,7 @@
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
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3ad23e2..9f7ca98 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1290,4 +1290,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/t4013-diff-various.sh b/t/t4013-diff-various.sh
index dde3f11..3f60f7d 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -95,6 +95,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 |
@@ -398,6 +407,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
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.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/t4014-format-patch.sh b/t/t4014-format-patch.sh
index b653dd7..db7e733 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1161,6 +1161,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' '
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 02255a0..9d07797 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -38,6 +38,7 @@
golang
html
java
+ markdown
matlab
objc
pascal
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/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 4f4b541..0b78573 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -14,7 +14,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" &&
diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 2affd7a..0f7a6d9 100755
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh
@@ -17,7 +17,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
}
diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
index 4831ad3..c1ed1c2 100755
--- a/t/t4067-diff-partial-clone.sh
+++ b/t/t4067-diff-partial-clone.sh
@@ -131,4 +131,52 @@
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 "git> done" trace >done_lines &&
+ test_line_count = 1 done_lines
+'
+
test_done
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/t4150-am.sh b/t/t4150-am.sh
index cb45271..bda4586 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -166,7 +166,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 &&
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 0f766ba..f1ea7d9 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -742,8 +742,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
'
@@ -787,6 +803,9 @@
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
'
@@ -801,6 +820,9 @@
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
'
@@ -816,11 +838,19 @@
git log -n6 --decorate=short --pretty="tformat:%f%d" \
--decorate-refs-exclude="heads/octopus*" \
--decorate-refs-exclude="tags/reach" >actual &&
+ test_cmp expect.decorate actual &&
+ git -c log.excludeDecoration="heads/octopus*" \
+ -c log.excludeDecoration="tags/reach" log \
+ -n6 --decorate=short --pretty="tformat:%f%d" >actual &&
+ test_cmp expect.decorate actual &&
+ git -c log.excludeDecoration="heads/octopus*" log \
+ --decorate-refs-exclude="tags/reach" \
+ -n6 --decorate=short --pretty="tformat:%f%d" >actual &&
test_cmp expect.decorate actual
'
test_expect_success 'decorate-refs and decorate-refs-exclude' '
- cat >expect.decorate <<-\EOF &&
+ cat >expect.no-decorate <<-\EOF &&
Merge-tag-reach (master)
Merge-tags-octopus-a-and-octopus-b
seventh
@@ -831,6 +861,21 @@
git log -n6 --decorate=short --pretty="tformat:%f%d" \
--decorate-refs="heads/*" \
--decorate-refs-exclude="heads/oc*" >actual &&
+ test_cmp expect.no-decorate actual
+'
+
+test_expect_success 'deocrate-refs and log.excludeDecoration' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach (master)
+ Merge-tags-octopus-a-and-octopus-b
+ seventh
+ octopus-b (octopus-b)
+ octopus-a (octopus-a)
+ reach (reach)
+ EOF
+ git -c log.excludeDecoration="heads/oc*" log \
+ --decorate-refs="heads/*" \
+ -n6 --decorate=short --pretty="tformat:%f%d" >actual &&
test_cmp expect.decorate actual
'
@@ -846,6 +891,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
'
@@ -1627,6 +1676,66 @@
grep "tag signed_tag_shallow names a non-parent $hash" actual
'
+test_expect_success GPG 'log --graph --show-signature for merged tag with missing key' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b plain-nokey master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-nokey master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_nokey &&
+ git checkout plain-nokey &&
+ git merge --no-ff -m msg signed_tag_nokey &&
+ GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpg: Signature made" actual &&
+ grep "^| | gpg: Can'"'"'t check signature: \(public key not found\|No public key\)" actual
+'
+
+test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b plain-bad master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-bad master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_bad &&
+ git cat-file tag signed_tag_bad >raw &&
+ sed -e "s/signed_tag_msg/forged/" raw >forged &&
+ git hash-object -w -t tag forged >forged.tag &&
+ git checkout plain-bad &&
+ git merge --no-ff -m msg "$(cat forged.tag)" &&
+ git log --graph --show-signature -n1 plain-bad >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpg: Signature made" actual &&
+ grep "^| | gpg: BAD signature from" actual
+'
+
+test_expect_success GPG 'log --show-signature for merged tag with GPG failure' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b plain-fail master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-fail master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_fail &&
+ git checkout plain-fail &&
+ git merge --no-ff -m msg signed_tag_fail &&
+ TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual &&
+ grep "^merged tag" actual &&
+ grep "^No signature" actual &&
+ ! grep "^gpg: Signature made" actual
+'
+
test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
test_when_finished "git reset --hard && git checkout master" &&
test_config gpg.format x509 &&
@@ -1648,6 +1757,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 master" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509-nokey master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509-nokey master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_x509_nokey &&
+ git checkout plain-x509-nokey &&
+ git merge --no-ff -m msg signed_tag_x509_nokey &&
+ GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpgsm: certificate not found" actual
+'
+
+test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509-bad master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509-bad master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_x509_bad &&
+ git cat-file tag signed_tag_x509_bad >raw &&
+ sed -e "s/signed_tag_msg/forged/" raw >forged &&
+ git hash-object -w -t tag forged >forged.tag &&
+ git checkout plain-x509-bad &&
+ git merge --no-ff -m msg "$(cat forged.tag)" &&
+ git log --graph --show-signature -n1 plain-x509-bad >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpgsm: Signature made" actual &&
+ grep "^| | gpgsm: invalid signature" actual
+'
+
+
test_expect_success GPG '--no-show-signature overrides --show-signature' '
git log -1 --show-signature --no-show-signature signed >actual &&
! grep "^gpg:" actual
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 4c8f3b8..6cdbe47 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -55,6 +55,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' '
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh
new file mode 100755
index 0000000..21b68dd
--- /dev/null
+++ b/t/t4216-log-bloom.sh
@@ -0,0 +1,155 @@
+#!/bin/sh
+
+test_description='git log for a path with Bloom filters'
+. ./test-lib.sh
+
+GIT_TEST_COMMIT_GRAPH=0
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
+
+test_expect_success 'setup test - repo, commits, commit graph, log outputs' '
+ git init &&
+ mkdir A A/B A/B/C &&
+ test_commit c1 A/file1 &&
+ test_commit c2 A/B/file2 &&
+ test_commit c3 A/B/C/file3 &&
+ test_commit c4 A/file1 &&
+ test_commit c5 A/B/file2 &&
+ test_commit c6 A/B/C/file3 &&
+ test_commit c7 A/file1 &&
+ test_commit c8 A/B/file2 &&
+ test_commit c9 A/B/C/file3 &&
+ test_commit c10 file_to_be_deleted &&
+ git checkout -b side HEAD~4 &&
+ test_commit side-1 file4 &&
+ git checkout master &&
+ git merge side &&
+ test_commit c11 file5 &&
+ mv file5 file5_renamed &&
+ git add file5_renamed &&
+ git commit -m "rename" &&
+ rm file_to_be_deleted &&
+ git add . &&
+ git commit -m "file removed" &&
+ git commit-graph write --reachable --changed-paths
+'
+graph_read_expect () {
+ NUM_CHUNKS=5
+ cat >expect <<- EOF
+ header: 43475048 1 1 $NUM_CHUNKS 0
+ num_commits: $1
+ chunks: oid_fanout oid_lookup commit_metadata bloom_indexes bloom_data
+ EOF
+ test-tool read-graph >actual &&
+ test_cmp expect actual
+}
+
+test_expect_success 'commit-graph write wrote out the bloom chunks' '
+ graph_read_expect 15
+'
+
+# 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 "$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\":0,\"zero_length_filter\":0,\"maybe\""
+ setup "$log_args" &&
+ grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" &&
+ test_cmp log_wo_bloom log_w_bloom &&
+ test_path_is_file "$TRASH_DIRECTORY/trace.perf"
+}
+
+test_bloom_filters_not_used () {
+ log_args=$1
+ setup "$log_args" &&
+ !(grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf") &&
+ test_cmp log_wo_bloom log_w_bloom
+}
+
+for path in A A/B A/B/C A/file1 A/B/file2 A/B/C/file3 file4 file5 file5_renamed file_to_be_deleted
+do
+ for option in "" \
+ "--all" \
+ "--full-history" \
+ "--full-history --simplify-merges" \
+ "--simplify-merges" \
+ "--simplify-by-decoration" \
+ "--follow" \
+ "--first-parent" \
+ "--topo-order" \
+ "--date-order" \
+ "--author-date-order" \
+ "--ancestry-path side..master"
+ do
+ test_expect_success "git log option: $option for path: $path" '
+ test_bloom_filters_used "$option -- $path"
+ '
+ 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 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_TEST_COMMIT_GRAPH_CHANGED_PATHS=0 git commit-graph write --reachable --split &&
+ test_line_count = 2 .git/objects/info/commit-graphs/commit-graph-chain
+'
+
+test_expect_success 'Do not use Bloom filters if the latest graph does not have Bloom filters.' '
+ test_bloom_filters_not_used "-- A/B"
+'
+
+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,\"zero_length_filter\":0,\"maybe\":8,\"definitely_not\":6"
+ 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_done
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh
index fd3bdbf..daf01c3 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_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/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 106eddb..3b76d2e 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,33 +39,33 @@
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
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 9bf920a..4245999 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -3,6 +3,8 @@
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" &&
@@ -12,6 +14,10 @@
test_oid_init
'
+test_expect_success POSIXPERM 'tweak umask for modebit tests' '
+ umask 022
+'
+
test_expect_success 'verify graph with no graph file' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph verify
@@ -43,7 +49,7 @@
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 &&
+ test_i18ngrep "unexpected non-hex object ID: HEAD" 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
@@ -96,6 +102,13 @@
graph_read_expect "3"
'
+test_expect_success POSIXPERM 'write graph has correct permissions' '
+ test_path_is_file $objdir/info/commit-graph &&
+ echo "-r--r--r--" >expect &&
+ test_modebits $objdir/info/commit-graph >actual &&
+ test_cmp expect actual
+'
+
graph_git_behavior 'graph exists' full commits/3 commits/1
test_expect_success 'Add more commits' '
@@ -421,7 +434,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() {
@@ -435,6 +449,7 @@
fi &&
git status --short &&
GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD=true git commit-graph write &&
+ chmod u+w $objdir/info/commit-graph &&
git commit-graph verify
}
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 43a7a66..7214cab 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -42,10 +42,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 "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 () {
@@ -521,10 +526,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 +538,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 &&
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..a581eaf 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -105,14 +105,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/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 53b2e6b..269d096 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 &&
@@ -36,6 +37,10 @@
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 +215,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 +362,67 @@
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 &&
+ test_might_fail run_with_limited_open_files 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_done
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index baa1a99..8c54e34 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -385,6 +385,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 master. The first is common; the rest are
+ # not.
+ test_commit -C myserver first_master_commit &&
+ git clone "file://$(pwd)/myserver" myclient &&
+ test_commit_bulk -C myclient 255 &&
+
+ # Another linked list of commits on anotherbranch with no connection to
+ # master. The first is common; the rest are not.
+ git -C myserver checkout --orphan anotherbranch &&
+ test_commit -C myserver first_anotherbranch_commit &&
+ git -C myclient fetch origin anotherbranch:refs/heads/anotherbranch &&
+ git -C myclient checkout anotherbranch &&
+ test_commit_bulk -C myclient 255 &&
+
+ # The new commit that the client wants to fetch.
+ git -C myserver checkout master &&
+ test_commit -C myserver to_fetch &&
+
+ # The client will send (as "have"s) all 256 commits in anotherbranch
+ # first. The 256th commit is common between the client and the server,
+ # and should reset in_vain. This allows negotiation to continue until
+ # the client reports that first_anotherbranch_commit is common.
+ git -C myclient fetch --progress origin master 2>log &&
+ test_i18ngrep "Total 3 " log
+'
+
test_expect_success 'fetch in shallow repo unreachable shallow objects' '
(
git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog &&
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 645b4c7..a32efe2 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -65,6 +65,7 @@
cat >exp <<EOF
To dst
! refs/heads/master:refs/heads/test [remote rejected] (missing necessary objects)
+Done
EOF
test_expect_success 'push without strict' '
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 04b3540..e98c3a0 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -4,6 +4,14 @@
. ./test-lib.sh
+generate_references () {
+ for ref
+ do
+ oid=$(git rev-parse "$ref") &&
+ printf '%s\t%s\n' "$oid" "$ref" || return 1
+ done
+}
+
test_expect_success setup '
>file &&
git add file &&
@@ -13,11 +21,11 @@
git tag mark1.1 &&
git tag mark1.2 &&
git tag mark1.10 &&
- git show-ref --tags -d | sed -e "s/ / /" >expected.tag &&
- (
- echo "$(git rev-parse HEAD) HEAD" &&
- git show-ref -d | sed -e "s/ / /"
- ) >expected.all &&
+ git show-ref --tags -d >expected.tag.raw &&
+ sed -e "s/ / /" expected.tag.raw >expected.tag &&
+ generate_references HEAD >expected.all &&
+ git show-ref -d >refs &&
+ sed -e "s/ / /" refs >>expected.all &&
git remote add self "$(pwd)/.git"
'
@@ -43,34 +51,31 @@
'
test_expect_success 'ls-remote --sort="version:refname" --tags self' '
- cat >expect <<-EOF &&
- $(git rev-parse mark) refs/tags/mark
- $(git rev-parse mark1.1) refs/tags/mark1.1
- $(git rev-parse mark1.2) refs/tags/mark1.2
- $(git rev-parse mark1.10) refs/tags/mark1.10
- EOF
+ generate_references \
+ refs/tags/mark \
+ refs/tags/mark1.1 \
+ refs/tags/mark1.2 \
+ refs/tags/mark1.10 >expect &&
git ls-remote --sort="version:refname" --tags self >actual &&
test_cmp expect actual
'
test_expect_success 'ls-remote --sort="-version:refname" --tags self' '
- cat >expect <<-EOF &&
- $(git rev-parse mark1.10) refs/tags/mark1.10
- $(git rev-parse mark1.2) refs/tags/mark1.2
- $(git rev-parse mark1.1) refs/tags/mark1.1
- $(git rev-parse mark) refs/tags/mark
- EOF
+ generate_references \
+ refs/tags/mark1.10 \
+ refs/tags/mark1.2 \
+ refs/tags/mark1.1 \
+ refs/tags/mark >expect &&
git ls-remote --sort="-version:refname" --tags self >actual &&
test_cmp expect actual
'
test_expect_success 'ls-remote --sort="-refname" --tags self' '
- cat >expect <<-EOF &&
- $(git rev-parse mark1.2) refs/tags/mark1.2
- $(git rev-parse mark1.10) refs/tags/mark1.10
- $(git rev-parse mark1.1) refs/tags/mark1.1
- $(git rev-parse mark) refs/tags/mark
- EOF
+ generate_references \
+ refs/tags/mark1.2 \
+ refs/tags/mark1.10 \
+ refs/tags/mark1.1 \
+ refs/tags/mark >expect &&
git ls-remote --sort="-refname" --tags self >actual &&
test_cmp expect actual
'
@@ -92,7 +97,7 @@
test_expect_success 'suppress "From <url>" with -q' '
git ls-remote -q 2>actual_err &&
- test_must_fail test_cmp exp_err actual_err
+ ! test_cmp exp_err actual_err
'
test_expect_success 'use branch.<name>.remote if possible' '
@@ -180,8 +185,8 @@
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 +217,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/master HEAD" >expect &&
+ generate_references \
+ HEAD \
+ refs/heads/master >>expect &&
+ oid=$(git rev-parse HEAD) &&
+ echo "$oid refs/remotes/origin/HEAD" >>expect &&
+ generate_references \
+ refs/remotes/origin/master \
+ refs/tags/mark \
+ refs/tags/mark1.1 \
+ refs/tags/mark1.10 \
+ refs/tags/mark1.2 >>expect &&
# Protocol v2 supports sending symrefs for refs other than HEAD, so use
# protocol v0 here.
GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref >actual &&
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 9ff041a..9c6218f 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1066,6 +1066,7 @@
echo >.git/foo "To testrepo" &&
echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" &&
+ echo >>.git/foo "Done" &&
test_must_fail git push >.git/bar --porcelain testrepo refs/heads/master:refs/heads/master &&
test_cmp .git/foo .git/bar
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 2f86fca..37535d6 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -10,11 +10,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 +28,7 @@
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull "$@" . copy 2>err &&
- test_i18ngrep "uncommitted changes." err
+ test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err
}
test_expect_success setup '
@@ -369,22 +371,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 +404,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 +451,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' '
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index ccde8ba..159afa7 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -11,10 +11,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 +30,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 +46,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,25 +62,25 @@
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)
'
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 4f681db..d427a2d 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -16,7 +16,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 +25,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 +35,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
)
'
@@ -56,11 +50,7 @@
git fetch &&
git fsck &&
git log --format=%s origin/master >actual &&
- cat <<EOF >expect &&
-5
-4
-3
-EOF
+ test_write_lines 5 4 3 >expect &&
test_cmp expect actual
)
'
@@ -75,10 +65,7 @@
git fetch --depth=2 &&
git fsck &&
git log --format=%s origin/master >actual &&
- cat <<EOF >expect &&
-6
-5
-EOF
+ test_write_lines 6 5 >expect &&
test_cmp expect actual
)
'
@@ -89,12 +76,7 @@
git fetch --unshallow &&
git fsck &&
git log --format=%s origin/master >actual &&
- cat <<EOF >expect &&
-6
-5
-4
-3
-EOF
+ test_write_lines 6 5 4 3 >expect &&
test_cmp expect actual
)
'
@@ -111,15 +93,10 @@
git fetch ../.git +refs/heads/master:refs/remotes/top/master &&
git fsck &&
git log --format=%s top/master >actual &&
- cat <<EOF >expect &&
-add-1-back
-4
-3
-EOF
+ test_write_lines add-1-back 4 3 >expect &&
test_cmp expect actual
) &&
git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
-
'
test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
@@ -131,16 +108,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
)
'
@@ -158,21 +131,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/master
+ refs/remotes/shallow/no-shallow
+ refs/tags/heavy-tag
+ refs/tags/light-tag
+ EOF
test_cmp expect.refs actual.refs &&
git log --format=%s shallow/master >actual &&
- cat <<EOF >expect &&
-7
-6
-5
-4
-3
-EOF
+ test_write_lines 7 6 5 4 3 >expect &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
+ (
+ cd shallow &&
+ git checkout master &&
+ commit 8 &&
+ git tag -m foo heavy-tag-for-graph HEAD^ &&
+ git tag light-tag-for-graph HEAD^:tracked
+ ) &&
+ test_config -C notshallow fetch.writeCommitGraph true &&
+ (
+ cd notshallow &&
+ git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
+ git fsck &&
+ git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
+ cat <<-EOF >expect.refs &&
+ refs/remotes/shallow/master
+ refs/remotes/shallow/no-shallow
+ refs/tags/heavy-tag
+ refs/tags/heavy-tag-for-graph
+ refs/tags/light-tag
+ refs/tags/light-tag-for-graph
+ EOF
+ test_cmp expect.refs actual.refs &&
+ git log --format=%s shallow/master >actual &&
+ test_write_lines 8 7 6 5 4 3 >expect &&
test_cmp expect actual
)
'
@@ -183,10 +179,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
'
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 23be8ce..afc680d 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -177,6 +177,9 @@
test $HEAD = $(git rev-parse --verify HEAD))
'
+## References of remote: atomic1(1) master(2) collateral(2) other(2)
+## References of local : atomic2(2) master(1) collateral(3) other(2) collateral1(3) atomic(1)
+## Atomic push : master(1) collateral(3) atomic(1)
test_expect_success 'push --atomic also prevents branch creation, reports collateral' '
# Setup upstream repo - empty for now
d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
@@ -189,7 +192,8 @@
test_commit atomic2 &&
git branch collateral &&
git branch other &&
- git push "$up" master collateral other &&
+ git push "$up" atomic1 master collateral other &&
+ git tag -d atomic1 &&
# collateral is a valid push, but should be failed by atomic push
git checkout collateral &&
@@ -224,7 +228,11 @@
# 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' '
diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh
index 7079bcf..620c30d 100755
--- a/t/t5543-atomic-push.sh
+++ b/t/t5543-atomic-push.sh
@@ -27,6 +27,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 &&
(
@@ -191,4 +197,87 @@
test_refs master HEAD@{1}
'
+# References in upstream : master(1) one(1) foo(1)
+# References in workbench: master(2) foo(1) two(2) bar(2)
+# Atomic push : master(2) two(2) bar(2)
+test_expect_success 'atomic push reports (reject by update hook)' '
+ mk_repo_pair &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git branch foo &&
+ git push up master one foo &&
+ git tag -d one
+ ) &&
+ (
+ mkdir -p upstream/.git/hooks &&
+ cat >upstream/.git/hooks/update <<-EOF &&
+ #!/bin/sh
+
+ if test "\$1" = "refs/heads/bar"
+ then
+ echo >&2 "Pusing to branch bar is prohibited"
+ exit 1
+ fi
+ EOF
+ chmod a+x upstream/.git/hooks/update
+ ) &&
+ (
+ cd workbench &&
+ test_commit two &&
+ git branch bar
+ ) &&
+ test_must_fail git -C workbench \
+ push --atomic up master two bar >out 2>&1 &&
+ fmt_status_report <out >actual &&
+ cat >expect <<-EOF &&
+ To ../upstream
+ ! [remote rejected] master -> master (atomic push failure)
+ ! [remote rejected] two -> two (atomic push failure)
+ ! [remote rejected] bar -> bar (hook declined)
+ EOF
+ test_cmp expect actual
+'
+
+# References in upstream : master(1) one(1) foo(1)
+# References in workbench: master(2) foo(1) two(2) bar(2)
+test_expect_success 'atomic push reports (mirror, but reject by update hook)' '
+ (
+ cd workbench &&
+ git remote remove up &&
+ git remote add up ../upstream
+ ) &&
+ test_must_fail git -C workbench \
+ push --atomic --mirror up >out 2>&1 &&
+ fmt_status_report <out >actual &&
+ cat >expect <<-EOF &&
+ To ../upstream
+ ! [remote rejected] master -> master (atomic push failure)
+ ! [remote rejected] one (atomic push failure)
+ ! [remote rejected] bar -> bar (hook declined)
+ ! [remote rejected] two -> two (atomic push failure)
+ EOF
+ test_cmp expect actual
+'
+
+# References in upstream : master(2) one(1) foo(1)
+# References in workbench: master(1) foo(1) two(2) bar(2)
+test_expect_success 'atomic push reports (reject by non-ff)' '
+ rm upstream/.git/hooks/update &&
+ (
+ cd workbench &&
+ git push up master &&
+ git reset --hard HEAD^
+ ) &&
+ test_must_fail git -C workbench \
+ push --atomic up master foo bar >out 2>&1 &&
+ fmt_status_report <out >actual &&
+ cat >expect <<-EOF &&
+ To ../upstream
+ ! [rejected] master -> master (non-fast-forward)
+ ! [rejected] bar -> bar (atomic push failed)
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5548-push-porcelain.sh b/t/t5548-push-porcelain.sh
new file mode 100755
index 0000000..1b19b3e
--- /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/master $oid
+}
+
+# Format the output of git-push, git-show-ref and other commands to make a
+# user-friendly and stable text. We can easily prepare the expect text
+# without having to worry about future changes of the commit ID and spaces
+# of the output.
+make_user_friendly_and_stable_output () {
+ sed \
+ -e "s/ *\$//" \
+ -e "s/ */ /g" \
+ -e "s/ / /g" \
+ -e "s/$A/<COMMIT-A>/g" \
+ -e "s/$B/<COMMIT-B>/g" \
+ -e "s/$ZERO_OID/<ZERO-OID>/g" \
+ -e "s/$(echo $A | cut -c1-7)[0-9a-f]*/<OID-A>/g" \
+ -e "s/$(echo $B | cut -c1-7)[0-9a-f]*/<OID-B>/g" \
+ -e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#"
+}
+
+setup_upstream_and_workbench () {
+ # Upstream after setup : master(B) foo(A) bar(A) baz(A)
+ # Workbench after setup : master(A)
+ test_expect_success "setup upstream repository and workbench" '
+ rm -rf upstream.git workbench &&
+ git init --bare upstream.git &&
+ git init workbench &&
+ create_commits_in workbench A B &&
+ (
+ cd workbench &&
+ # Try to make a stable fixed width for abbreviated commit ID,
+ # this fixed-width oid will be replaced with "<OID>".
+ git config core.abbrev 7 &&
+ git remote add origin ../upstream.git &&
+ git update-ref refs/heads/master $A &&
+ git push origin \
+ $B:refs/heads/master \
+ $A:refs/heads/foo \
+ $A:refs/heads/bar \
+ $A:refs/heads/baz
+ ) &&
+ git -C "workbench" config advice.pushUpdateRejected false &&
+ upstream=upstream.git
+ '
+}
+
+run_git_push_porcelain_output_test() {
+ case $1 in
+ http)
+ PROTOCOL="HTTP protocol"
+ URL_PREFIX="http://.*"
+ ;;
+ file)
+ PROTOCOL="builtin protocol"
+ URL_PREFIX="\.\."
+ ;;
+ esac
+
+ # Refs of upstream : master(B) foo(A) bar(A) baz(A)
+ # Refs of workbench: master(A) baz(A) next(A)
+ # git-push : master(A) NULL (B) baz(A) next(A)
+ test_expect_success "porcelain output of successful git-push ($PROTOCOL)" '
+ (
+ cd workbench &&
+ git update-ref refs/heads/master $A &&
+ git update-ref refs/heads/baz $A &&
+ git update-ref refs/heads/next $A &&
+ git push --porcelain --force origin \
+ master \
+ :refs/heads/foo \
+ $B:bar \
+ baz \
+ next
+ ) >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ = refs/heads/baz:refs/heads/baz [up to date]
+ <COMMIT-B>:refs/heads/bar <OID-A>..<OID-B>
+ - :refs/heads/foo [deleted]
+ + refs/heads/master:refs/heads/master <OID-B>...<OID-A> (forced update)
+ * refs/heads/next:refs/heads/next [new branch]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ git -C "$upstream" show-ref >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ <COMMIT-B> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/master
+ <COMMIT-A> refs/heads/next
+ EOF
+ test_cmp expect actual
+ '
+
+ # Refs of upstream : master(A) bar(B) baz(A) next(A)
+ # Refs of workbench: master(B) bar(A) baz(A) next(A)
+ # git-push : master(B) bar(A) NULL next(A)
+ test_expect_success "atomic push failed ($PROTOCOL)" '
+ (
+ cd workbench &&
+ git update-ref refs/heads/master $B &&
+ git update-ref refs/heads/bar $A &&
+ test_must_fail git push --atomic --porcelain origin \
+ master \
+ bar \
+ :baz \
+ next
+ ) >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ = refs/heads/next:refs/heads/next [up to date]
+ ! refs/heads/bar:refs/heads/bar [rejected] (non-fast-forward)
+ ! (delete):refs/heads/baz [rejected] (atomic push failed)
+ ! refs/heads/master:refs/heads/master [rejected] (atomic push failed)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ git -C "$upstream" show-ref >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ <COMMIT-B> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/master
+ <COMMIT-A> refs/heads/next
+ EOF
+ test_cmp expect actual
+ '
+ test_expect_success "prepare pre-receive hook ($PROTOCOL)" '
+ write_script "$upstream/hooks/pre-receive" <<-EOF
+ exit 1
+ EOF
+ '
+
+ # Refs of upstream : master(A) bar(B) baz(A) next(A)
+ # Refs of workbench: master(B) bar(A) baz(A) next(A)
+ # git-push : master(B) bar(A) NULL next(A)
+ test_expect_success "pre-receive hook declined ($PROTOCOL)" '
+ (
+ cd workbench &&
+ git update-ref refs/heads/master $B &&
+ git update-ref refs/heads/bar $A &&
+ test_must_fail git push --porcelain --force origin \
+ master \
+ bar \
+ :baz \
+ next
+ ) >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ = refs/heads/next:refs/heads/next [up to date]
+ ! refs/heads/bar:refs/heads/bar [remote rejected] (pre-receive hook declined)
+ ! :refs/heads/baz [remote rejected] (pre-receive hook declined)
+ ! refs/heads/master:refs/heads/master [remote rejected] (pre-receive hook declined)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ git -C "$upstream" show-ref >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ <COMMIT-B> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/master
+ <COMMIT-A> refs/heads/next
+ EOF
+ test_cmp expect actual
+ '
+
+ test_expect_success "remove pre-receive hook ($PROTOCOL)" '
+ rm "$upstream/hooks/pre-receive"
+ '
+
+ # Refs of upstream : master(A) bar(B) baz(A) next(A)
+ # Refs of workbench: master(B) bar(A) baz(A) next(A)
+ # git-push : master(B) bar(A) NULL next(A)
+ test_expect_success "non-fastforward push ($PROTOCOL)" '
+ (
+ cd workbench &&
+ test_must_fail git push --porcelain origin \
+ master \
+ bar \
+ :baz \
+ next
+ ) >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ = refs/heads/next:refs/heads/next [up to date]
+ - :refs/heads/baz [deleted]
+ refs/heads/master:refs/heads/master <OID-A>..<OID-B>
+ ! refs/heads/bar:refs/heads/bar [rejected] (non-fast-forward)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ git -C "$upstream" show-ref >out &&
+ make_user_friendly_and_stable_output <out >actual &&
+ cat >expect <<-EOF &&
+ <COMMIT-B> refs/heads/bar
+ <COMMIT-B> refs/heads/master
+ <COMMIT-A> refs/heads/next
+ EOF
+ test_cmp expect actual
+ '
+}
+
+# Initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+# Run git-push porcelain test on builtin protocol
+run_git_push_porcelain_output_test file
+
+ROOT_PATH="$PWD"
+. "$TEST_DIRECTORY"/lib-gpg.sh
+. "$TEST_DIRECTORY"/lib-httpd.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
+start_httpd
+
+# Re-initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+test_expect_success "setup for http" '
+ git -C upstream.git config http.receivepack true &&
+ upstream="$HTTPD_DOCUMENT_ROOT_PATH/upstream.git" &&
+ mv upstream.git "$upstream" &&
+
+ git -C workbench remote set-url origin $HTTPD_URL/smart/upstream.git
+'
+
+setup_askpass_helper
+
+# Run git-push porcelain test on HTTP protocol
+run_git_push_porcelain_output_test http
+
+test_done
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index b811d89..5048530 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -248,9 +248,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' '
@@ -321,11 +319,17 @@
'
test_expect_success 'remote-http complains cleanly about malformed urls' '
- # do not actually issue "list" or other commands, as we do not
- # want to rely on what curl would actually do with such a broken
- # URL. This is just about making sure we do not segfault during
- # initialization.
- test_must_fail git remote-http http::/example.com/repo.git
+ test_must_fail git remote-http http::/example.com/repo.git 2>stderr &&
+ test_i18ngrep "url has no scheme" stderr
+'
+
+# NEEDSWORK: Writing commands to git-remote-curl can race against the latter
+# erroring out, producing SIGPIPE. Remove "ok=sigpipe" once transport-helper has
+# learned to handle early remote helper failures more cleanly.
+test_expect_success 'remote-http complains cleanly about empty scheme' '
+ test_must_fail ok=sigpipe git ls-remote \
+ http::${HTTPD_URL#http}/dumb/repo.git 2>stderr &&
+ test_i18ngrep "url has no scheme" stderr
'
test_expect_success 'redirects can be forbidden/allowed' '
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index 4a110b3..3f4ac71 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\\n" \
+ "$ZERO_OID" "$hash_next" | 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/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 0c74b4e..2f7be23 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -175,7 +175,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 &&
(
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 9108ff6..6d5a977 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -16,7 +16,7 @@
test_expect_success '"verify" needs a worktree' '
git bundle create tip.bundle -1 master &&
- test_must_fail nongit git bundle verify ../tip.bundle 2>err &&
+ nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
test_i18ngrep "need a repository" err
'
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index 60c1ba9..8e0fd39 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -92,24 +92,17 @@
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..e3b436d 100755
--- a/t/t5612-clone-refspec.sh
+++ b/t/t5612-clone-refspec.sh
@@ -71,9 +71,9 @@
(
cd dir_all &&
git fetch &&
- git for-each-ref refs/remotes/origin |
+ git for-each-ref refs/remotes/origin >refs &&
sed -e "/HEAD$/d" \
- -e "s|/remotes/origin/|/heads/|" >../actual
+ -e "s|/remotes/origin/|/heads/|" refs >../actual
) &&
# follow both master and side
git for-each-ref refs/heads >expect &&
@@ -87,7 +87,7 @@
git for-each-ref refs/tags >../actual
) &&
git for-each-ref refs/tags >expect &&
- test_must_fail test_cmp expect actual &&
+ ! test_cmp expect actual &&
test_line_count = 2 actual
'
@@ -104,9 +104,9 @@
(
cd dir_master &&
git fetch --force &&
- git for-each-ref refs/remotes/origin |
+ git for-each-ref refs/remotes/origin >refs &&
sed -e "/HEAD$/d" \
- -e "s|/remotes/origin/|/heads/|" >../actual
+ -e "s|/remotes/origin/|/heads/|" refs >../actual
) &&
# only follow master
git for-each-ref refs/heads/master >expect &&
@@ -126,9 +126,9 @@
(
cd dir_master_no_tags &&
git fetch &&
- git for-each-ref refs/remotes/origin |
+ git for-each-ref refs/remotes/origin >refs &&
sed -e "/HEAD$/d" \
- -e "s|/remotes/origin/|/heads/|" >../actual
+ -e "s|/remotes/origin/|/heads/|" refs >../actual
) &&
# only follow master
git for-each-ref refs/heads/master >expect &&
@@ -156,9 +156,9 @@
(
cd dir_side &&
git fetch &&
- git for-each-ref refs/remotes/origin |
+ git for-each-ref refs/remotes/origin >refs &&
sed -e "/HEAD$/d" \
- -e "s|/remotes/origin/|/heads/|" >../actual
+ -e "s|/remotes/origin/|/heads/|" refs >../actual
) &&
# only follow side
git for-each-ref refs/heads/side >expect &&
@@ -169,9 +169,9 @@
(
cd dir_side2 &&
git fetch &&
- git for-each-ref refs/remotes/origin |
+ git for-each-ref refs/remotes/origin >refs &&
sed -e "/HEAD$/d" \
- -e "s|/remotes/origin/|/heads/|" >../actual
+ -e "s|/remotes/origin/|/heads/|" refs >../actual
) &&
# only follow side
git for-each-ref refs/heads/side >expect &&
@@ -223,9 +223,9 @@
(
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/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 77bb91e..8a27452 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -49,7 +49,7 @@
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)
'
@@ -384,12 +384,11 @@
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
+# 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 +414,14 @@
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_DIRECTORY"/lib-httpd.sh
start_httpd
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 7fba306..a34460f 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -13,10 +13,7 @@
}
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
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
new file mode 100755
index 0000000..950cfb2
--- /dev/null
+++ b/t/t5704-protocol-violations.sh
@@ -0,0 +1,33 @@
+#!/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 &&
+ 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 &&
+ 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/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 121e5c6..0f04b6c 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -11,9 +11,15 @@
PATH="$TEST_DIRECTORY/t5801:$PATH"
compare_refs() {
+ fail= &&
+ if test "x$1" = 'x!'
+ then
+ fail='!' &&
+ shift
+ fi &&
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
- test_cmp expect actual
+ eval $fail test_cmp expect actual
}
test_expect_success 'setup repository' '
@@ -189,7 +195,7 @@
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' '
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index a10f0df..b6fa43a 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -154,4 +154,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 'rebuild repo' '
+ rm -rf .git * &&
+ git init &&
+ git switch -c main &&
+
+ 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 main &&
+ 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 main &&
+ 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 main &&
+ 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/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 821a0c8..ac31fae 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -148,7 +148,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 +166,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 +175,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
'
@@ -485,7 +485,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
@@ -792,6 +792,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 &&
diff --git a/t/t6113-rev-list-bitmap-filters.sh b/t/t6113-rev-list-bitmap-filters.sh
index 145603f..2b551e6 100755
--- a/t/t6113-rev-list-bitmap-filters.sh
+++ b/t/t6113-rev-list-bitmap-filters.sh
@@ -53,4 +53,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/t6120-describe.sh b/t/t6120-describe.sh
index 34502e3..f822d5d 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -129,12 +129,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_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
'
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 8a72b4c..b15582a 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -6,6 +6,7 @@
test_description='fmt-merge-msg test'
. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
test_expect_success setup '
echo one >one &&
@@ -73,6 +74,10 @@
apos="'\''"
'
+test_expect_success GPG 'set up a signed tag' '
+ git tag -s -m signed-tag-msg signed-good-tag left
+'
+
test_expect_success 'message for merging local branch' '
echo "Merge branch ${apos}left${apos}" >expected &&
@@ -83,6 +88,24 @@
test_cmp expected actual
'
+test_expect_success GPG 'message for merging local tag signed by good key' '
+ git checkout master &&
+ git fetch . signed-good-tag &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+ grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+ grep "^# gpg: Signature made" actual &&
+ grep "^# gpg: Good signature from" actual
+'
+
+test_expect_success GPG 'message for merging local tag signed by unknown key' '
+ git checkout master &&
+ git fetch . signed-good-tag &&
+ GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+ grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+ grep "^# gpg: Signature made" actual &&
+ grep "^# 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 &&
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 9c910ce..da59fad 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -20,6 +20,10 @@
}
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 &&
@@ -50,6 +54,9 @@
"
}
+hexlen=$(test_oid hexsz)
+disklen=$(test_oid disklen)
+
test_atom head refname refs/heads/master
test_atom head refname: refs/heads/master
test_atom head refname:short master
@@ -82,9 +89,9 @@
test_atom head push:strip=1 remotes/myfork/master
test_atom head push:strip=-1 master
test_atom head objecttype commit
-test_atom head objectsize 171
-test_atom head objectsize:disk 138
-test_atom head deltabase 0000000000000000000000000000000000000000
+test_atom head objectsize $((131 + hexlen))
+test_atom head objectsize:disk $disklen
+test_atom head deltabase $ZERO_OID
test_atom head objectname $(git rev-parse refs/heads/master)
test_atom head objectname:short $(git rev-parse --short refs/heads/master)
test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master)
@@ -125,11 +132,11 @@
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)
@@ -139,7 +146,7 @@
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 ''
@@ -643,17 +650,59 @@
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 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" &&
@@ -888,4 +937,44 @@
test_cmp expect actual
'
+test_expect_success 'for-each-ref --ignore-case works on multiple sort keys' '
+ # name refs numerically to avoid case-insensitive filesystem conflicts
+ nr=0 &&
+ for email in a A b B
+ do
+ for subject in a A b B
+ do
+ GIT_COMMITTER_EMAIL="$email@example.com" \
+ git tag -m "tag $subject" icase-$(printf %02d $nr) &&
+ nr=$((nr+1))||
+ return 1
+ done
+ done &&
+ git for-each-ref --ignore-case \
+ --format="%(taggeremail) %(subject) %(refname)" \
+ --sort=refname \
+ --sort=subject \
+ --sort=taggeremail \
+ refs/tags/icase-* >actual &&
+ cat >expect <<-\EOF &&
+ <a@example.com> tag a refs/tags/icase-00
+ <a@example.com> tag A refs/tags/icase-01
+ <A@example.com> tag a refs/tags/icase-04
+ <A@example.com> tag A refs/tags/icase-05
+ <a@example.com> tag b refs/tags/icase-02
+ <a@example.com> tag B refs/tags/icase-03
+ <A@example.com> tag b refs/tags/icase-06
+ <A@example.com> tag B refs/tags/icase-07
+ <b@example.com> tag a refs/tags/icase-08
+ <b@example.com> tag A refs/tags/icase-09
+ <B@example.com> tag a refs/tags/icase-12
+ <B@example.com> tag A refs/tags/icase-13
+ <b@example.com> tag b refs/tags/icase-10
+ <b@example.com> tag B refs/tags/icase-11
+ <B@example.com> tag b refs/tags/icase-14
+ <B@example.com> tag B refs/tags/icase-15
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index b24d850..475564b 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -51,8 +51,10 @@
done &&
git commit-graph write --reachable &&
mv .git/objects/info/commit-graph commit-graph-full &&
+ chmod u+w commit-graph-full &&
git show-ref -s commit-5-5 | git commit-graph write --stdin-commits &&
mv .git/objects/info/commit-graph commit-graph-half &&
+ chmod u+w commit-graph-half &&
git config core.commitGraph true
'
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 6db92bd..74b637d 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1726,6 +1726,7 @@
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
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index 190ae14..428cff9 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -18,7 +18,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 +30,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
@@ -95,6 +119,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 +141,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 +164,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 +174,7 @@
?? four
?? three
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -183,6 +213,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 +223,7 @@
?? dtwo/
?? three
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -230,6 +262,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 +270,7 @@
?? .gitignore
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -286,6 +320,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 +328,7 @@
?? dtwo/
?? two
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -343,6 +379,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 +387,7 @@
?? .gitignore
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -390,10 +428,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
@@ -447,12 +487,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
@@ -487,12 +529,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 +558,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 +566,7 @@
?? done/sub/
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../status.actual &&
cat >../trace.expect <<EOF &&
node creation: 2
@@ -560,6 +606,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 +621,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 +629,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 +644,7 @@
?? done/sub/
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../status.actual
'
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index a1cb9ff..6734642 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
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e3e2aab..956e17a 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -938,7 +938,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 +1010,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 &&
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/t7416-submodule-dash-url.sh b/t/t7416-submodule-dash-url.sh
index 5ba041f..eec96e0 100755
--- a/t/t7416-submodule-dash-url.sh
+++ b/t/t7416-submodule-dash-url.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='check handling of .gitmodule url with dash'
+test_description='check handling of disallowed .gitmodule urls'
. ./test-lib.sh
test_expect_success 'create submodule with protected dash in url' '
@@ -60,4 +60,145 @@
test_i18ngrep ! "unknown option" err
'
+test_expect_success 'fsck rejects missing URL scheme' '
+ git checkout --orphan missing-scheme &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = http::one.example.com/foo.git
+ EOF
+ git add .gitmodules &&
+ test_tick &&
+ git commit -m "gitmodules with missing URL scheme" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative URL resolving to missing scheme' '
+ git checkout --orphan relative-missing-scheme &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = "..\\../.\\../:one.example.com/foo.git"
+ EOF
+ git add .gitmodules &&
+ test_tick &&
+ git commit -m "gitmodules with relative URL that strips off scheme" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects empty URL scheme' '
+ git checkout --orphan empty-scheme &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = http::://one.example.com/foo.git
+ EOF
+ git add .gitmodules &&
+ test_tick &&
+ git commit -m "gitmodules with empty URL scheme" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative URL resolving to empty scheme' '
+ git checkout --orphan relative-empty-scheme &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = ../../../:://one.example.com/foo.git
+ EOF
+ git add .gitmodules &&
+ test_tick &&
+ git commit -m "relative gitmodules URL resolving to empty scheme" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects empty hostname' '
+ git checkout --orphan empty-host &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = http:///one.example.com/foo.git
+ EOF
+ git add .gitmodules &&
+ test_tick &&
+ git commit -m "gitmodules with extra slashes" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative url that produced empty hostname' '
+ git checkout --orphan messy-relative &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = ../../..//one.example.com/foo.git
+ EOF
+ git add .gitmodules &&
+ test_tick &&
+ git commit -m "gitmodules abusing relative_path" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck permits embedded newline with unrecognized scheme' '
+ git checkout --orphan newscheme &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = "data://acjbkd%0akajfdickajkd"
+ EOF
+ git add .gitmodules &&
+ git commit -m "gitmodules with unrecognized scheme" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ git push dst HEAD
+'
+
+test_expect_success 'fsck rejects embedded newline in url' '
+ # create an orphan branch to avoid existing .gitmodules objects
+ git checkout --orphan newline &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = "https://one.example.com?%0ahost=two.example.com/foo.git"
+ EOF
+ git add .gitmodules &&
+ git commit -m "gitmodules with newline" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects embedded newline in relative url' '
+ git checkout --orphan relative-newline &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = "./%0ahost=two.example.com/foo.git"
+ EOF
+ git add .gitmodules &&
+ git commit -m "relative url with newline" &&
+ test_when_finished "rm -rf dst" &&
+ git init --bare dst &&
+ git -C dst config transfer.fsckObjects true &&
+ test_must_fail git push dst HEAD 2>err &&
+ grep gitmodulesUrl err
+'
+
test_done
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 482ce35..8e969f3 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1471,7 +1471,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"' '
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 0c06d22..6baaa1a 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -6,6 +6,11 @@
. "$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 &&
@@ -155,6 +160,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 +172,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 "^$(test_oid header) " >cat.commit &&
test_cmp show.commit commit &&
test_cmp show.gpg verify.2 &&
test_cmp cat.commit verify.1
@@ -299,10 +309,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 &&
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1326088..5883a6a 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -29,15 +29,19 @@
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
-printf '%s\n' 1 2 3 4 5 6 7 8 9 >file
-printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >file.1
-printf '%s\n' 1 2 3 4 '5 X' 6 7 8 9 >file.5
-printf '%s\n' 1 2 3 4 5 6 7 8 '9 X' >file.9
-printf '%s\n' 1 2 3 4 5 6 7 8 '9 Y' >file.9y
-printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >result.1
-printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
-printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
-printf '%s\n' 1 2 3 4 5 6 7 8 '9 Z' >result.9z
+test_write_lines 1 2 3 4 5 6 7 8 9 >file
+cp file file.orig
+test_write_lines '1 X' 2 3 4 5 6 7 8 9 >file.1
+test_write_lines 1 2 '3 X' 4 5 6 7 8 9 >file.3
+test_write_lines 1 2 3 4 '5 X' 6 7 8 9 >file.5
+test_write_lines 1 2 3 4 5 6 7 8 '9 X' >file.9
+test_write_lines 1 2 3 4 5 6 7 8 '9 Y' >file.9y
+test_write_lines '1 X' 2 3 4 5 6 7 8 9 >result.1
+test_write_lines '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
+test_write_lines '1 X' 2 3 4 5 6 7 8 '9 X' >result.1-9
+test_write_lines '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
+test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
+test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
create_merge_msgs () {
echo "Merge tag 'c2'" >msg.1-5 &&
@@ -81,7 +85,7 @@
}
verify_parents () {
- printf '%s\n' "$@" >parents.expected &&
+ test_write_lines "$@" >parents.expected &&
>parents.actual &&
i=1 &&
while test $i -le $#
@@ -95,7 +99,7 @@
}
verify_mergeheads () {
- printf '%s\n' "$@" >mergehead.expected &&
+ test_write_lines "$@" >mergehead.expected &&
while read sha1 rest
do
git rev-parse $sha1
@@ -675,6 +679,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
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index c6c44ec..0f97828 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -27,6 +27,44 @@
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=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-only given' '
+ git reset --hard c0 &&
+ git pull --ff-only . c1 2>err &&
+ test_i18ngrep ! "Pulling without specifying how to reconcile" err
+'
+
test_expect_success 'merge c1 with c2' '
git reset --hard c1 &&
test -f c0.c &&
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index e904132..5c8894d 100755
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t7609-merge-co-error-msgs.sh
@@ -126,7 +126,7 @@
git rm rep2 -r &&
>rep &&
>rep2 &&
- git add rep rep2&&
+ git add rep rep2 &&
git commit -m "added test as a file" &&
git checkout master &&
>rep/untracked-file &&
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 7d7b396..991d5bd 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -72,6 +72,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 +486,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
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index c90fdc5..83f8f5c 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -486,7 +486,7 @@
{
properties \
unimportant "something with a NUL (Q)" \
- svn:log "commit message"&&
+ svn:log "commit message" &&
echo PROPS-END
} |
q_to_nul >props &&
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/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/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/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 3e41c58..768257b 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -3381,4 +3381,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/master
+commit refs/heads/master
+mark :2
+author Full Name <user@company.tld> 1000000000 +0100
+committer Full Name <user@company.tld> 1000000000 +0100
+data 24
+Test submodule commit 1
+M 100644 :1 file
+
+blob
+mark :3
+data 8
+foo
+bar
+
+commit refs/heads/master
+mark :4
+author Full Name <user@company.tld> 1000000001 +0100
+committer Full Name <user@company.tld> 1000000001 +0100
+data 24
+Test submodule commit 2
+from :2
+M 100644 :3 file
+Y_INPUT_END
+
+# Note that the submodule object IDs are intentionally not translated.
+cat >Y-main-input <<\Y_INPUT_END
+blob
+mark :1
+data 4
+foo
+
+reset refs/heads/master
+commit refs/heads/master
+mark :2
+author Full Name <user@company.tld> 2000000000 +0100
+committer Full Name <user@company.tld> 2000000000 +0100
+data 14
+Test commit 1
+M 100644 :1 file
+
+blob
+mark :3
+data 73
+[submodule "sub1"]
+ path = sub1
+ url = https://void.example.com/main.git
+
+commit refs/heads/master
+mark :4
+author Full Name <user@company.tld> 2000000001 +0100
+committer Full Name <user@company.tld> 2000000001 +0100
+data 14
+Test commit 2
+from :2
+M 100644 :3 .gitmodules
+M 160000 0712c5be7cf681388e355ef47525aaf23aee1a6d sub1
+
+blob
+mark :5
+data 8
+foo
+bar
+
+commit refs/heads/master
+mark :6
+author Full Name <user@company.tld> 2000000002 +0100
+committer Full Name <user@company.tld> 2000000002 +0100
+data 14
+Test commit 3
+from :4
+M 100644 :5 file
+M 160000 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 sub1
+Y_INPUT_END
+
+cat >Y-marks <<\Y_INPUT_END
+:2 0712c5be7cf681388e355ef47525aaf23aee1a6d
+:4 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7
+Y_INPUT_END
+
+test_expect_success 'Y: setup' '
+ test_oid_cache <<-EOF
+ Ymaster sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
+ Ymaster sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
+ EOF
+'
+
+test_expect_success 'Y: rewrite submodules' '
+ git init main1 &&
+ (
+ cd main1 &&
+ git init sub2 &&
+ git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
+ git fast-import --rewrite-submodules-from=sub:../Y-marks \
+ --rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
+ test "$(git rev-parse master)" = "$(test_oid Ymaster)"
+ )
+'
+
test_done
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index cc8d463..267ddc9 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -53,7 +53,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 +139,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 +179,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 +197,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 +213,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 +223,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,7 +324,7 @@
test_expect_success \
'Create a merge' \
'git checkout b &&
- echo "Branch" >> b &&
+ echo "Branch" >>b &&
git add b &&
git commit -a -m "On branch" &&
git checkout master &&
@@ -342,26 +342,26 @@
test_expect_success \
'Prepare large commit' \
'git checkout b &&
- echo "To be changed" > 01-change &&
- echo "To be renamed" > 02-pure-rename-from &&
- echo "To be deleted" > 03-delete &&
- echo "To be renamed and changed" > 04-rename-from &&
- echo "To have mode changed" > 05-mode-change &&
- echo "File to symlink" > 06-file-or-symlink &&
- echo "To be changed and have mode changed" > 07-change-mode-change &&
+ echo "To be changed" >01-change &&
+ echo "To be renamed" >02-pure-rename-from &&
+ echo "To be deleted" >03-delete &&
+ echo "To be renamed and changed" >04-rename-from &&
+ echo "To have mode changed" >05-mode-change &&
+ echo "File to symlink" >06-file-or-symlink &&
+ echo "To be changed and have mode changed" >07-change-mode-change &&
git add 0* &&
git commit -a -m "Prepare large commit" &&
- echo "Changed" > 01-change &&
+ echo "Changed" >01-change &&
git mv 02-pure-rename-from 02-pure-rename-to &&
git rm 03-delete && rm -f 03-delete &&
- echo "A new file" > 03-new &&
+ echo "A new file" >03-new &&
git add 03-new &&
git mv 04-rename-from 04-rename-to &&
- echo "Changed" >> 04-rename-to &&
+ echo "Changed" >>04-rename-to &&
test_chmod +x 05-mode-change &&
rm -f 06-file-or-symlink &&
test_ln_s_add 01-change 06-file-or-symlink &&
- echo "Changed and have mode changed" > 07-change-mode-change &&
+ echo "Changed and have mode changed" >07-change-mode-change &&
test_chmod +x 07-change-mode-change &&
git commit -a -m "Large commit" &&
git checkout master'
@@ -444,7 +444,7 @@
test_expect_success \
'logs: history (implicit HEAD, deleted file)' \
'git checkout master &&
- echo "to be deleted" > deleted_file &&
+ echo "to be deleted" >deleted_file &&
git add deleted_file &&
git commit -m "Add file to be deleted" &&
git rm deleted_file &&
@@ -522,7 +522,7 @@
'. "$TEST_DIRECTORY"/t3901/utf8.txt &&
test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
- echo "UTF-8" >> file &&
+ echo "UTF-8" >>file &&
git add file &&
git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
gitweb_run "p=.git;a=commit"'
@@ -532,7 +532,7 @@
'. "$TEST_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 &&
@@ -675,8 +675,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 +704,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 +712,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 +729,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 +754,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 +769,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'
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/t9834-git-p4-file-dir-bug.sh b/t/t9834-git-p4-file-dir-bug.sh
new file mode 100755
index 0000000..031e1f8
--- /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 &&
+ test_might_fail 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..3c44af6 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1638,6 +1638,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 &&
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 352c213..3103be8 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -905,7 +905,7 @@
# - not all diff versions understand "-u"
test_cmp() {
- $GIT_TEST_CMP "$@"
+ eval "$GIT_TEST_CMP" '"$@"'
}
# Check that the given config key has the expected value.
@@ -1362,14 +1362,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).
+# convert function arguments or stdin (if not arguments given) to pktline
+# representation. If multiple arguments are given, they are separated by
+# whitespace and put in a single packet. Note that data containing NULs must be
+# given on stdin, and that empty input becomes an empty packet, not a flush
+# packet (for that you can just print 0000 yourself).
packetize() {
- cat >packetize.tmp &&
- len=$(wc -c <packetize.tmp) &&
- printf '%04x%s' "$(($len + 4))" &&
- cat packetize.tmp &&
- rm -f packetize.tmp
+ if test $# -gt 0
+ then
+ packet="$*"
+ printf '%04x%s' "$((4 + ${#packet}))" "$packet"
+ else
+ perl -e '
+ my $packet = do { local $/; <STDIN> };
+ printf "%04x%s", 4 + length($packet), $packet;
+ '
+ fi
}
# Parse the input as a series of pktlines, writing the result to stdout.
@@ -1543,3 +1551,13 @@
test_cmp "$1.normalized" "$2.normalized" &&
rm -f "$1.normalized" "$2.normalized"
}
+
+# Tests for the hidden file attribute on Windows
+test_path_is_hidden () {
+ test_have_prereq MINGW ||
+ BUG "test_path_is_hidden can only be used on Windows"
+
+ # Use the output of `attrib`, ignore the absolute path
+ case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac
+ return 1
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0ea1e5a..baf9454 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#--*=} ;;
@@ -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
@@ -494,21 +527,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='
'
@@ -657,6 +675,20 @@
fi
}
+file_lineno () {
+ test -z "$GIT_TEST_FRAMEWORK_SELFTEST" && test -n "$BASH" || return 0
+ eval '
+ local i
+ for i in ${!BASH_SOURCE[*]}
+ do
+ case $i,"${BASH_SOURCE[$i]##*/}" in
+ 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;;
+ *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;;
+ esac
+ done
+ '
+}
+
GIT_EXIT_OK=
trap 'die' EXIT
# Disable '-x' tracing, because with some shells, notably dash, it
@@ -702,7 +734,7 @@
write_junit_xml_testcase "$1" " $junit_insert"
fi
test_failure=$(($test_failure + 1))
- say_color error "not ok $test_count - $1"
+ say_color error "$(file_lineno error)not ok $test_count - $1"
shift
printf '%s\n' "$*" | sed -e 's/^/# /'
test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }
@@ -882,6 +914,7 @@
fi
}
+trace_level_=0
want_trace () {
test "$trace" = t && {
test "$verbose" = t || test "$verbose_log" = t
@@ -895,7 +928,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 +959,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
@@ -1085,6 +1119,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 +1418,20 @@
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')
+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
@@ -1619,6 +1668,15 @@
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"
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/trace2.c b/trace2.c
index c7b4f14..2c6b570 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)
{
diff --git a/trace2.h b/trace2.h
index e5e81c0..b18bc55 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".
*
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/transport-helper.c b/transport-helper.c
index 20a7185..a46afcb 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -894,6 +894,7 @@
case REF_STATUS_REJECT_STALE:
case REF_STATUS_REJECT_ALREADY_EXISTS:
if (atomic) {
+ reject_atomic_push(remote_refs, mirror);
string_list_clear(&cas_options, 0);
return 0;
} else
@@ -1488,3 +1489,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.c b/transport.c
index 1fdc7da..15f5ba4 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"
@@ -715,7 +715,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;
@@ -1240,20 +1248,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,
diff --git a/transport.h b/transport.h
index e0131da..4298c85 100644
--- a/transport.h
+++ b/transport.h
@@ -265,4 +265,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..f3d303c 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -434,6 +434,9 @@
if (diff_can_quit_early(opt))
break;
+ if (opt->max_changes && opt->num_changes > opt->max_changes)
+ break;
+
if (opt->pathspec.nr) {
skip_uninteresting(&t, base, opt);
for (i = 0; i < nparent; i++)
@@ -518,6 +521,7 @@
/* t↓ */
update_tree_entry(&t);
+ opt->num_changes++;
}
/* t > p[imin] */
@@ -535,6 +539,7 @@
skip_emit_tp:
/* ∀ pi=p[imin] pi↓ */
update_tp_entries(tp, nparent);
+ opt->num_changes++;
}
}
@@ -552,6 +557,7 @@
const struct object_id **parents_oid, int nparent,
struct strbuf *base, struct diff_options *opt)
{
+ opt->num_changes = 0;
p = ll_diff_tree_paths(p, oid, parents_oid, nparent, base, opt);
/*
diff --git a/unpack-trees.c b/unpack-trees.c
index 1ecdab3..02048df 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -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) \
@@ -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++)
@@ -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,
@@ -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);
@@ -422,9 +456,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 +537,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 +1546,20 @@
clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
}
+static void populate_from_existing_patterns(struct unpack_trees_options *o,
+ struct pattern_list *pl)
+{
+ char *sparse = git_pathdup("info/sparse-checkout");
+
+ pl->use_cone_patterns = core_sparse_checkout_cone;
+ if (add_patterns_from_file_to_list(sparse, "", 0, pl, NULL) < 0)
+ o->skip_sparse_checkout = 1;
+ else
+ o->pl = pl;
+ free(sparse);
+}
+
+
static int verify_absent(const struct cache_entry *,
enum unpack_trees_error_types,
struct unpack_trees_options *);
@@ -1507,22 +1574,18 @@
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));
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));
@@ -1614,11 +1677,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,36 +1699,24 @@
* 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) {
@@ -1690,9 +1739,9 @@
o->src_index = NULL;
done:
- trace_performance_leave("unpack_trees");
- if (!o->keep_pattern_list)
+ if (free_pattern_list)
clear_pattern_list(&pl);
+ trace_performance_leave("unpack_trees");
return ret;
return_failed:
@@ -1705,6 +1754,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 +1906,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 +1932,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 +2144,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 +2177,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 +2206,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..9c2f082 100644
--- a/unpack-trees.h
+++ b/unpack-trees.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];
+ const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
struct argv_array 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..0478bff 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -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)
@@ -68,7 +69,6 @@
static int filter_capability_requested;
static int allow_filter;
static int allow_ref_in_want;
-static struct list_objects_filter_options filter_options;
static int allow_sideband_all;
@@ -103,7 +103,8 @@
}
static void create_pack_file(const struct object_array *have_obj,
- const struct object_array *want_obj)
+ const struct object_array *want_obj,
+ struct list_objects_filter_options *filter_options)
{
struct child_process pack_objects = CHILD_PROCESS_INIT;
char data[8193], progress[128];
@@ -140,9 +141,9 @@
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) {
+ if (filter_options->choice) {
const char *spec =
- expand_list_objects_filter_spec(&filter_options);
+ expand_list_objects_filter_spec(filter_options);
if (pack_objects.use_shell) {
struct strbuf buf = STRBUF_INIT;
sq_quote_buf(&buf, spec);
@@ -848,7 +849,9 @@
return 0;
}
-static void receive_needs(struct packet_reader *reader, struct object_array *want_obj)
+static void receive_needs(struct packet_reader *reader,
+ struct object_array *want_obj,
+ struct list_objects_filter_options *filter_options)
{
struct object_array shallows = OBJECT_ARRAY_INIT;
struct string_list deepen_not = STRING_LIST_INIT_DUP;
@@ -883,8 +886,8 @@
if (skip_prefix(reader->line, "filter ", &arg)) {
if (!filter_capability_requested)
die("git upload-pack: filtering capability not negotiated");
- list_objects_filter_die_if_populated(&filter_options);
- parse_list_objects_filter(&filter_options, arg);
+ list_objects_filter_die_if_populated(filter_options);
+ parse_list_objects_filter(filter_options, arg);
continue;
}
@@ -1087,11 +1090,14 @@
struct string_list symref = STRING_LIST_INIT_DUP;
struct object_array want_obj = OBJECT_ARRAY_INIT;
struct packet_reader reader;
+ struct list_objects_filter_options filter_options;
stateless_rpc = options->stateless_rpc;
timeout = options->timeout;
daemon_mode = options->daemon_mode;
+ memset(&filter_options, 0, sizeof(filter_options));
+
git_config(upload_pack_config, NULL);
head_ref_namespaced(find_symref, &symref);
@@ -1114,12 +1120,14 @@
PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_DIE_ON_ERR_PACKET);
- receive_needs(&reader, &want_obj);
+ receive_needs(&reader, &want_obj, &filter_options);
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);
+ create_pack_file(&have_obj, &want_obj, &filter_options);
}
+
+ list_objects_filter_release(&filter_options);
}
struct upload_pack_data {
@@ -1134,6 +1142,8 @@
int deepen_rev_list;
int deepen_relative;
+ struct list_objects_filter_options filter_options;
+
struct packet_writer writer;
unsigned stateless_rpc : 1;
@@ -1169,6 +1179,7 @@
oid_array_clear(&data->haves);
object_array_clear(&data->shallows);
string_list_clear(&data->deepen_not, 0);
+ list_objects_filter_release(&data->filter_options);
}
static int parse_want(struct packet_writer *writer, const char *line,
@@ -1252,7 +1263,7 @@
struct upload_pack_data *data,
struct object_array *want_obj)
{
- while (packet_reader_read(request) != PACKET_READ_FLUSH) {
+ while (packet_reader_read(request) == PACKET_READ_NORMAL) {
const char *arg = request->line;
const char *p;
@@ -1306,8 +1317,8 @@
}
if (allow_filter && skip_prefix(arg, "filter ", &p)) {
- list_objects_filter_die_if_populated(&filter_options);
- parse_list_objects_filter(&filter_options, p);
+ list_objects_filter_die_if_populated(&data->filter_options);
+ parse_list_objects_filter(&data->filter_options, p);
continue;
}
@@ -1321,6 +1332,9 @@
/* ignore unknown lines maybe? */
die("unexpected line: '%s'", arg);
}
+
+ if (request->status != PACKET_READ_FLUSH)
+ die(_("expected flush after fetch arguments"));
}
static int process_haves(struct oid_array *haves, struct oid_array *common,
@@ -1511,7 +1525,7 @@
send_shallow_info(&data, &want_obj);
packet_writer_write(&data.writer, "packfile\n");
- create_pack_file(&have_obj, &want_obj);
+ create_pack_file(&have_obj, &want_obj, &data.filter_options);
state = FETCH_DONE;
break;
case FETCH_DONE:
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/userdiff.c b/userdiff.c
index efbe05e..1df884e 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -79,6 +79,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
@@ -222,7 +225,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 +269,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/worktree.c b/worktree.c
index eba4fd3..ee82235 100644
--- a/worktree.c
+++ b/worktree.c
@@ -226,17 +226,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;
}
@@ -285,6 +288,7 @@
unsigned flags)
{
struct strbuf wt_path = STRBUF_INIT;
+ struct strbuf realpath = STRBUF_INIT;
char *path = NULL;
int err, ret = -1;
@@ -336,7 +340,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 +349,7 @@
done:
free(path);
strbuf_release(&wt_path);
+ strbuf_release(&realpath);
return ret;
}
@@ -450,7 +456,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 +470,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"));
diff --git a/wrapper.c b/wrapper.c
index e1eaef2..3a1c0e0 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -218,7 +218,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 +240,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..98dfa6f 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -722,16 +722,14 @@
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);
}
diff --git a/wt-status.h b/wt-status.h
index 71c3f25..73ab5d4 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;
